diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index 887439a62..8c565b8f9 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -48,21 +48,3 @@ else
   source "$ZSH/themes/$ZSH_THEME.zsh-theme"
 fi
 
-<<<<<<< HEAD
-# Load all of your custom configurations from custom/
-for config_file ($ZSH/custom/*.zsh) source $config_file
-
-# Compile zcompdump, if modified, to increase startup speed.
-if [ "$HOME/.zcompdump" -nt "$HOME/.zcompdump.zwc" -o ! -e "$HOME/.zcompdump.zwc" ]; then
-  zcompile "$HOME/.zcompdump"
-fi
-
-# Check for updates on initial load...
-if [ "$DISABLE_AUTO_UPDATE" = "true" ]
-then
-  return
-else
-  /usr/bin/env zsh $ZSH/tools/check_for_upgrade.sh
-fi
-=======
->>>>>>> robbyrussel/master