diff --git a/octoprint/templates/settings.jinja2 b/octoprint/templates/settings.jinja2
index dc889d23..f1819741 100644
--- a/octoprint/templates/settings.jinja2
+++ b/octoprint/templates/settings.jinja2
@@ -276,7 +276,6 @@
                         </div>
                     </form>
                 </div>
-<<<<<<< HEAD
 				<div class="tab-pane" id="settings_cura">
 					<form class="form-horizontal">
 						<div class="control-group">
@@ -299,8 +298,6 @@
 						</div>
 					</form>
 				</div>
- 
-=======
                 <div class="tab-pane" id="settings_api">
                     <form class="form-horizontal">
                         <div class="control-group">
@@ -319,7 +316,6 @@
                     </form>
                 </div>
 
->>>>>>> devel
                 {% if enableAccessControl %}
                 <div class="tab-pane" id="settings_users">
                     <table class="table table-condensed table-hover" id="system_users">
diff --git a/octoprint/util/__init__.py.orig b/octoprint/util/__init__.py.orig
deleted file mode 100644
index 187d45c5..00000000
--- a/octoprint/util/__init__.py.orig
+++ /dev/null
@@ -1,140 +0,0 @@
-# coding=utf-8
-__author__ = "Gina Häußge <osd@foosel.net>"
-__license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html'
-
-import os
-import traceback
-import sys
-import time
-
-from octoprint.settings import settings
-
-def getFormattedSize(num):
-	"""
-	Taken from http://stackoverflow.com/a/1094933/2028598
-	"""
-	for x in ["bytes","KB","MB","GB"]:
-		if num < 1024.0:
-			return "%3.1f%s" % (num, x)
-		num /= 1024.0
-	return "%3.1f%s" % (num, "TB")
-
-
-def isAllowedFile(filename, extensions):
-	return "." in filename and filename.rsplit(".", 1)[1] in extensions
-
-
-def getFormattedTimeDelta(d):
-	if d is None:
-		return None
-	hours = d.seconds // 3600
-	minutes = (d.seconds % 3600) // 60
-	seconds = d.seconds % 60
-	return "%02d:%02d:%02d" % (hours, minutes, seconds)
-
-
-def getFormattedDateTime(d):
-	if d is None:
-		return None
-
-	return d.strftime("%Y-%m-%d %H:%M")
-
-
-def getClass(name):
-	"""
-	Taken from http://stackoverflow.com/a/452981/2028598
-	"""
-	parts = name.split(".")
-	module = ".".join(parts[:-1])
-	m = __import__(module)
-	for comp in parts[1:]:
-		m = getattr(m, comp)
-	return m
-
-<<<<<<< HEAD
-def matchesGcode(line, gcode):
-	return re.search("^\s*%s\D" % gcode, line, re.I)
-
-def isGcodeFileName(filename):
-	"""Simple helper to determine if a filename has the .gcode extension.
-
-	:param filename: :class: `str`
-
-	:returns boolean:
-	"""
-	return "." in filename and filename.rsplit(".", 1)[1] in ["gcode", "GCODE"]
-
-def isSTLFileName(filename):
-	"""Simple helper to determine if a filename has the .stl extension.
-
-	:param filename: :class: `str`
-
-	:returns boolean:
-	"""
-	return "." in filename and filename.rsplit(".", 1)[1] in ["stl", "STL"]
-	
-def genGcodeFileName(filename):
-
-	if not filename:
-		return None
-
-	if "." not in filename:
-		return filename + ".gcode"
-
-	return filename.replace('.stl', '.gcode')
-	
-=======
-
-def isDevVersion():
-	gitPath = os.path.abspath(os.path.join(os.path.split(os.path.abspath(__file__))[0], "../../.git"))
-	return os.path.exists(gitPath)
-
-
-def getExceptionString():
-	locationInfo = traceback.extract_tb(sys.exc_info()[2])[0]
-	return "%s: '%s' @ %s:%s:%d" % (str(sys.exc_info()[0].__name__), str(sys.exc_info()[1]), os.path.basename(locationInfo[0]), locationInfo[2], locationInfo[1])
-
-
-def getGitInfo():
-	gitPath = os.path.abspath(os.path.join(os.path.split(os.path.abspath(__file__))[0], "../../.git"))
-	if not os.path.exists(gitPath):
-		return (None, None)
-
-	headref = None
-	with open(os.path.join(gitPath, "HEAD"), "r") as f:
-		headref = f.readline().strip()
-
-	if headref is None:
-		return (None, None)
-
-	headref = headref[len("ref: "):]
-	branch = headref[headref.rfind("/") + 1:]
-	with open(os.path.join(gitPath, headref)) as f:
-		head = f.readline().strip()
-
-	return (branch, head)
-
-
-def getNewTimeout(type):
-	now = time.time()
-
-	if type not in ["connection", "detection", "communication"]:
-		return now # timeout immediately for unknown timeout type
-
-	return now + settings().getFloat(["serial", "timeout", type])
-
-
-def getFreeBytes(path):
-	"""
-	Taken from http://stackoverflow.com/a/2372171/2028598
-	"""
-	if sys.platform == "win32":
-		import ctypes
-		freeBytes = ctypes.c_ulonglong(0)
-		ctypes.windll.kernel32.GetDiskFreeSpaceExW(ctypes.c_wchar_p(path), None, None, ctypes.pointer(freeBytes))
-		return freeBytes.value
-	else:
-		st = os.statvfs(path)
-		return st.f_bavail * st.f_frsize
-
->>>>>>> devel