Fix missed conflict

beat/core/scripts/worker.py

@@ -390,12 +390,8 @@ def main(user_input=None):
                 parts = [
                     WorkerController.ERROR,
                     b"Unknown job: %s" % job_id
-<<<<<<< HEAD
                 ]
                 send_multipart(socket, parts)
-=======
-                ])
->>>>>>> More py3k fixes
                 continue
 
             # Kill the processing thread