diff --git a/translate2modelcif.py b/translate2modelcif.py
index b092c6e1489c0f9e5366c38a4f6a200a79d5bc32..e685cb6ff151293ea7fbb9c1b8d62e43b00d3f1c 100644
--- a/translate2modelcif.py
+++ b/translate2modelcif.py
@@ -251,6 +251,7 @@ def _get_protocol_steps_and_software(cnfg_file):
     # Must refer to existing data, so we try keywords
     step["output"] = "model"
     # get software
+<<<<<<< HEAD
     step["software"] = [
         {
             "name": "ColabFold",