diff --git a/themes/metal/metal.theme.bash b/themes/metal/metal.theme.bash
index a489a2b8..115b082d 100644
--- a/themes/metal/metal.theme.bash
+++ b/themes/metal/metal.theme.bash
@@ -9,7 +9,6 @@
 
 # inspired by previous bash_it theme : cupcake
 
-<<<<<<< HEAD
 
 # aws credentials support
 # based in bash profile
@@ -19,11 +18,7 @@
 
 # Demo:
 # ┌ⓔ virtualenv 🐲🤘user @ 💻 host in  [ AWS-profile] 🤖   🗂️ directory on 🌵 branch {1} ↑1 ↓1 +1 •1 ⌀1 ✗
-=======
-# Demo:
-# ┌ⓔ virtualenv 🐲🤘user @ 💻 host in 🗂️ directory on 🌵 branch {1} ↑1 ↓1 +1 •1 ⌀1 ✗
->>>>>>> cb74bd63b9158072a7b59c223ee284918586a02b
-# └❯ cd .bash-it/themes/cupcake
+# └❯
 
 # virtualenv prompts
 VIRTUALENV_CHAR="ⓔ "
@@ -49,20 +44,13 @@ GIT_THEME_PROMPT_DIRTY=" ${red}✗${normal}"
 GIT_THEME_PROMPT_CLEAN=" ${bold_green}✓${normal}"
 GIT_THEME_PROMPT_PREFIX=""
 GIT_THEME_PROMPT_SUFFIX=""
-<<<<<<< HEAD
-=======
-
->>>>>>> cb74bd63b9158072a7b59c223ee284918586a02b
 # ICONS =======================================================================
 
 icon_start="┌"
 icon_user="🤘-🐧"
 icon_host="@ 💻 "
 icon_directory=" - 🧱 "
-<<<<<<< HEAD
 icon_cloud="🤖"
-=======
->>>>>>> cb74bd63b9158072a7b59c223ee284918586a02b
 icon_branch="🌵"
 icon_end="└🤘-> "
 
@@ -77,17 +65,6 @@ function virtualenv_prompt {
     echo -e "$VIRTUALENV_CHAR$virtualenv "
   fi
 }
-<<<<<<< HEAD
-#aws
-
-function aws_prompt {
-  if [[ -n "$AWS_DEFAULT_PROFILE" ]]; then
-    aws_cred=`"$AWS_DEFAULT_PROFILE"`
-    echo -e "$AWS_DEFAULT_PROFILE"
-  fi
-}
-=======
->>>>>>> cb74bd63b9158072a7b59c223ee284918586a02b
 
 # Rename tab
 function tabname {
@@ -103,17 +80,11 @@ function winname {
 
 # Displays the current prompt
 function prompt_command() {
-<<<<<<< HEAD
   #PS1="\n${icon_start}$(virtualenv_prompt)${icon_user}${bold_green}\u${normal}${icon_host}${bold_cyan}\h${normal}${icon_directory}${bold_purple}\W${normal}\$([[ -n \$(git branch 2> /dev/null) ]] && echo \" on ${icon_branch}  \")${white}$(scm_prompt_info)${normal}\n${icon_end}"
   #PS2="${icon_end}"
   #PS1="\[${green}\]AWS [\[${red}\]$AWS_DEFAULT_PROFILE\[${green}\]]:\[${reset}\] \w $ "
   PS1="\n${icon_start}$(virtualenv_prompt)${icon_user}${bold_green}\u${normal}${icon_host}${bold_cyan}\h\[${green}\] ${icon_cloud} [\[${bold_red}\]$AWS_DEFAULT_PROFILE\[${green}\]]:\[${reset}\]${icon_directory}${bold_purple}\W${normal}\$([[ -n \$(git branch 2> /dev/null) ]] && echo \" on ${icon_branch}  \")${white}$(scm_prompt_info)${normal}\n${icon_end}"
   PS2="${icon_end}"
-
-=======
-  PS1="\n${icon_start}$(virtualenv_prompt)${icon_user}${bold_green}\u${normal}${icon_host}${bold_cyan}\h${normal}${icon_directory}${bold_purple}\W${normal}\$([[ -n \$(git branch 2> /dev/null) ]] && echo \" on ${icon_branch}  \")${white}$(scm_prompt_info)${normal}\n${icon_end}"
-  PS2="${icon_end}"
->>>>>>> cb74bd63b9158072a7b59c223ee284918586a02b
 }
 
 # Runs prompt (this bypasses bash_it $PROMPT setting)