diff --git a/lib/django.zsh b/lib/django.zsh
index 3ccb798c5..7175ddb0d 100644
--- a/lib/django.zsh
+++ b/lib/django.zsh
@@ -1,15 +1,10 @@
-<<<<<<< HEAD
-=======
 alias pm='python manage.py'
->>>>>>> upstream/master
 alias pmr='python manage.py runserver'
 alias pmrp='python manage.py runserver_plus'
 alias pmrpg='pmrp --adminmedia=`pwd`/media/admin'
 alias pmsdb='python manage.py syncdb'
 alias pms='python manage.py shell'
-<<<<<<< HEAD
 alias pmlf='python manage.py loaddata fixtures/*'
-=======
 alias pmsp='python manage.py shell_plus'
 alias pmlf='python manage.py loaddata fixtures/*'
 alias pmt='python -W ignore::DeprecationWarning manage.py test'
@@ -34,4 +29,3 @@ function djapp() {
     echo "from django.contrib import admin\nfrom $1.models import *\n\n" > $1/admin.py
     echo "from django.conf.urls.defaults import *\n\n" > $1/urls.py
 }
->>>>>>> upstream/master
diff --git a/lib/history.zsh b/lib/history.zsh
index 877fe1fd8..c12c85823 100644
--- a/lib/history.zsh
+++ b/lib/history.zsh
@@ -1,4 +1,4 @@
-## Command history configuration
+
 HISTFILE=$HOME/.zsh_history
 HISTSIZE=10000
 SAVEHIST=10000
@@ -10,11 +10,8 @@ setopt hist_verify
 setopt inc_append_history
 setopt extended_history
 setopt hist_expire_dups_first
-<<<<<<< HEAD
 
-=======
 setopt hist_ignore_space
 
 setopt SHARE_HISTORY
->>>>>>> upstream/master
 setopt APPEND_HISTORY
diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index 4d58efd62..ef27a93c7 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -8,10 +8,8 @@ fpath=($ZSH/functions $fpath)
 for config_file ($ZSH/lib/*.zsh) source $config_file
 
 # Load all of your custom configurations from custom/
-for config_file ($ZSH/custom/*.zsh) source $config_file
+#for config_file ($ZSH/custom/*.zsh) source $config_file
 
-<<<<<<< HEAD
-=======
 # Load all of the plugins that were defined in ~/.zshrc
 plugin=${plugin:=()}
 for plugin ($plugins) source $ZSH/plugins/$plugin/$plugin.plugin.zsh
@@ -23,4 +21,3 @@ then
 else
   /usr/bin/env zsh $ZSH/tools/check_for_upgrade.sh
 fi
->>>>>>> upstream/master