diff --git a/app/scheduler/views.py b/app/scheduler/views.py
index 4f05e70fb4cac91e921aeef4499829fe09184308..a74f6695447f63122ceb813e0a552fd00a4a7330 100644
--- a/app/scheduler/views.py
+++ b/app/scheduler/views.py
@@ -25,13 +25,8 @@ def scheduler():
 
 
 def process_job(job):
-<<<<<<< HEAD
     input_dir = '/home/pjentsch/%s/input' % job['service']
     output_dir = '/home/pjentsch/%s/output' % job['service']
-=======
-    input_dir = '/home/pjentsch/ocr/input'
-    output_dir = '/home/pjentsch/ocr/output'
->>>>>>> e6446834b4c4251154497a7104cd84d1188be981
 
     job['status'] = 'running'
     print('### Job status changed ###')