diff --git a/robot/resources/lib/python_keywords/complex_object_actions.py b/robot/resources/lib/python_keywords/complex_object_actions.py
index f04e752a..7a06f12a 100644
--- a/robot/resources/lib/python_keywords/complex_object_actions.py
+++ b/robot/resources/lib/python_keywords/complex_object_actions.py
@@ -24,7 +24,6 @@ ROBOT_AUTO_KEYWORDS = False
 
 
 @keyword('Get Link Object')
-<<<<<<< HEAD
 def get_link_object(wallet: str, cid: str, oid: str, bearer_token: str = "",
         wallet_config: str = WALLET_CONFIG):
     """