diff --git a/pypreprocessor/__init__.py b/pypreprocessor/__init__.py
index <HASH>..<HASH> 100644
--- a/pypreprocessor/__init__.py
+++ b/pypreprocessor/__init__.py
@@ -5,14 +5,11 @@ __author__ = 'Evan Plaice'
 __version__ = '0.6.0'
 #modified by hendiol
 
-
 # changed by hendiol at 18.01.2017: added reset_internal for processing several files after each other
-<<<<<<< HEAD
 # changed by hendiol at 11.04.2017: trying to get nested #ifdefs handeld
+# changed by hendiol at 12.04.2017: improved (several file processing) and added nested ifdef statements possible
+
 
-=======
-#test for further changes
->>>>>>> develop-several_files
 import sys
 import os
 import traceback
Added the features and cleaned up head information