diff --git a/xos/core/admin.py b/xos/core/admin.py
index aa6f7f8..f668ae0 100644
--- a/xos/core/admin.py
+++ b/xos/core/admin.py
@@ -402,7 +402,6 @@
     def queryset(self, request):
         return Tag.select_by_user(request.user)
 
-<<<<<<< HEAD
 class NetworkLookerUpper:
     """ This is a callable that looks up a network name in a instance and returns
         the ip address for that network.