diff --git a/inbox/monocle/app.py b/inbox/monocle/app.py
index d2d5146b9..276c39322 100755
--- a/inbox/monocle/app.py
+++ b/inbox/monocle/app.py
@@ -1,9 +1,6 @@
 #!/usr/bin/python
-<<<<<<< HEAD
 import platform
 from subprocess import call
-=======
->>>>>>> fd32cd43396ccb4a0b5714bc6a7790b9f33b0943
 import json
 import datetime
 from collections import defaultdict