diff --git a/post-receive b/post-receive
index 902ce20..6b14e62 100755
--- a/post-receive
+++ b/post-receive
@@ -1,5 +1,9 @@
 #!/bin/bash
+<<<<<<< HEAD
 # Mirror all branches to GitHub on push
+=======
+# Mirror all pushes to GitHub
+>>>>>>> 16bba77 (Hopefully Working)
 
 GITHUB_REMOTE=github
 BRANCHES=$(git branch -r | grep -v '\->' | sed 's/origin\///')