diff --git a/pythonrewrite/bin2/CryptoBoxWebserver.py b/pythonrewrite/bin2/CryptoBoxWebserver.py
index d71a8f7..e06c7c5 100644
--- a/pythonrewrite/bin2/CryptoBoxWebserver.py
+++ b/pythonrewrite/bin2/CryptoBoxWebserver.py
@@ -11,19 +11,6 @@ try:
 except:
 	print "could not import clearsilver modules! Try apt-get install python-clearsilver."
 	
-
-<<<<<<< .mine
-class RunCmd:
-	def index(self):
-		hdf = neo_util.HDF()
-		#hdf.setValue("hdf.loadpaths.0","/my/path")
-		hdf.readFile("../lang/de.hdf")
-		hdf.setValue("Settings.TemplateDir","../templates")
-		hdf.setValue("Settings.Stylesheet","cryptobox.css")
-		hdf.setValue("Data.Action","show_status")
-		cs = neo_cs.CS(hdf)
-		cs.parseFile("../templates/main.cs")
-=======
 class clearsilver:
 	def __init__(self):
 		pass
@@ -45,7 +32,6 @@ class clearsilver:
 			hdf.setValue(key,str(settings[key]))
 		cs= neo_cs.CS(hdf)
 		cs.parseFile(cs_path)
->>>>>>> .r387
 		return cs.render()