diff --git a/setup.py b/setup.py
index 481e1e2de2ecbee862848fa8e6cafe6fdfb4b179..84904c0cf2cb306ea6f987c2b9962bbef9311df8 100644
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,6 @@
 # Local install: sudo pip install -e ./
 
 import setuptools
-import pkg_resources
 
 with open("src/snipper/version.py", "r", encoding="utf-8") as fh:
     __version__ = fh.read().split(" = ")[1].strip()[1:-1]
diff --git a/src/codesnipper.egg-info/PKG-INFO b/src/codesnipper.egg-info/PKG-INFO
index 2b2b8f1deb87a526571b7b975747a0f805b1ccac..8c998c1e5076da443b7b31a2c967eae1ab4e0ca4 100644
--- a/src/codesnipper.egg-info/PKG-INFO
+++ b/src/codesnipper.egg-info/PKG-INFO
@@ -1,6 +1,10 @@
 Metadata-Version: 2.1
 Name: codesnipper
+<<<<<<< HEAD
 Version: 0.1.18.11
+=======
+Version: 0.1.18.10
+>>>>>>> 6fce20d6e5d8194b6a072056a9a906939d4ee070
 Summary: A lightweight framework for censoring student solutions files and extracting code + output
 Home-page: https://lab.compute.dtu.dk/tuhe/snipper
 Author: Tue Herlau
diff --git a/src/snipper/__pycache__/snip_dir.cpython-39.pyc b/src/snipper/__pycache__/snip_dir.cpython-39.pyc
index 26d4b16c42dfc9f06cb6b530ecbee9662c4fa6b2..ac636f5285cd7692c8743c3e9e3e2e334ab0e6a6 100644
Binary files a/src/snipper/__pycache__/snip_dir.cpython-39.pyc and b/src/snipper/__pycache__/snip_dir.cpython-39.pyc differ
diff --git a/src/snipper/snipper_main.py b/src/snipper/snipper_main.py
index 1e818f0c7d992ae7a284ca520c1cb4ff9872b2a3..b7efbea7fde4118f4fb235a9c196b757123121a9 100644
--- a/src/snipper/snipper_main.py
+++ b/src/snipper/snipper_main.py
@@ -32,6 +32,12 @@ def censor_code(lines, keep=True):
     lines, nB, cut = fix_b(lines, keep=keep)
     return lines
 
+def fix_tags(lines):
+    for k, l in enumerate(lines):
+        # if l.find(" # !") > 0:
+        #     print(f"{file}:{k}> bad snipper tag, fixing")
+        lines[k] = l.replace("# !", "#!")
+    return lines
 
 def censor_file(file, run_files=True, run_out_dirs=None, cut_files=True,
                 output_solution=False,
diff --git a/src/snipper/version.py b/src/snipper/version.py
index 742f628c35fca09e99a85a4ed896d5d0fead1084..da38f5d4ec64b951c0078ad16ec4b30b648723ea 100644
--- a/src/snipper/version.py
+++ b/src/snipper/version.py
@@ -1 +1,5 @@
+<<<<<<< HEAD
 __version__ = "0.1.18.11"
+=======
+__version__ = "0.1.18.10"
+>>>>>>> 6fce20d6e5d8194b6a072056a9a906939d4ee070