diff --git a/lib/functions.zsh b/lib/functions.zsh
index 2980e7794..ac91f7ba7 100644
--- a/lib/functions.zsh
+++ b/lib/functions.zsh
@@ -37,7 +37,6 @@ function take() {
   mkdir -p $1
   cd $1
 }
-<<<<<<< HEAD
 
 function logview() {
     if [ -x $(which ccze) ]; then
@@ -55,5 +54,3 @@ function logtail() {
     fi
 }
 
-=======
->>>>>>> upstream/master
diff --git a/plugins/ssh-agent/ssh_agent.plugin.zsh b/plugins/ssh_agent/ssh_agent.plugin.zsh
similarity index 100%
rename from plugins/ssh-agent/ssh_agent.plugin.zsh
rename to plugins/ssh_agent/ssh_agent.plugin.zsh