From b7053630a56b28300a91655eea6f20310a619d72 Mon Sep 17 00:00:00 2001
From: Milan Kolar <milan@pype.club>
Date: Tue, 16 Oct 2018 23:42:17 +0200
Subject: [PATCH] resolve conflict

---
 .../global/publish/collect_deadline_user.py   | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pype/plugins/global/publish/collect_deadline_user.py b/pype/plugins/global/publish/collect_deadline_user.py
index 21e8f4ff08..3474696d5f 100644
--- a/pype/plugins/global/publish/collect_deadline_user.py
+++ b/pype/plugins/global/publish/collect_deadline_user.py
@@ -34,22 +34,22 @@ class CollectDeadlineUser(pyblish.api.ContextPlugin):
 
     order = pyblish.api.CollectorOrder + 0.499
     label = "Deadline User"
-<<<<<<< HEAD
-    hosts = ['maya', 'fusion']
-    families = ["studio.renderlayer", "studio.saver.deadline"]
-=======
+
     hosts = ['maya', 'fusion', 'nuke']
     families = [
-        "renderlayer",
-        "saver.deadline",
-        "imagesequence"
+        "studio.renderlayer",
+        "studio.saver.deadline",
+        "studio.imagesequence"
     ]
->>>>>>> origin/ftrack-all-jakub
+
 
     def process(self, context):
         """Inject the current working file"""
-
-        user = deadline_command("GetCurrentUserName").strip()
+        user = None
+        try:
+            user = deadline_command("GetCurrentUserName").strip()
+        except:
+            self.log.warning("Deadline command seems not to be working")
 
         if not user:
             self.log.warning("No Deadline user found. "