diff --git a/hm.py b/hm.py
index 85b6f173..4941f417 100644
--- a/hm.py
+++ b/hm.py
@@ -1,12 +1,5 @@
 #! /usr/bin/env python
 
-<<<<<<< .working
-# test 2
-
-=======
-# test 1
-
->>>>>>> .merge-right.r259
 # hm.py: 'Help Me', is a simple wrapper for `cmake` and `hg`.
 # 
 # This script was created for the Synergy+ project.