diff --git a/package_io/input_parser.star b/package_io/input_parser.star
index ecdb692..f56a22d 100644
--- a/package_io/input_parser.star
+++ b/package_io/input_parser.star
@@ -87,29 +87,6 @@ def get_args_with_default_values(args):
 
 
 def parse_input(input_args):
-<<<<<<< HEAD
-	result = default_input_args()
-	for attr in input_args:
-		value = input_args[attr]
-		# if its insterted we use the value inserted
-		if attr not in ATTR_TO_BE_SKIPPED_AT_ROOT and attr in input_args:
-			result[attr] = value
-		elif attr == "network_params":
-			for sub_attr in input_args["network_params"]:
-				sub_value = input_args["network_params"][sub_attr]
-				result["network_params"][sub_attr] = sub_value
-		elif attr == "participants":
-			participants = []
-			for participant in input_args["participants"]:
-				new_participant = default_participant()
-				for sub_attr, sub_value in participant.items():
-					# if the value is set in input we set it in participant
-					new_participant[sub_attr] = sub_value
-				for _ in range(0, new_participant["count"]):
-					participant_copy = deep_copy_participant(new_participant)
-					participants.append(new_participant)
-			result["participants"] = participants
-=======
     result = default_input_args()
     for attr in input_args:
         value = input_args[attr]
@@ -130,7 +107,6 @@ def parse_input(input_args):
                 for _ in range(0, new_participant["count"]):
                     participants.append(new_participant)
             result["participants"] = participants
->>>>>>> 0b1c204 (run linter everytime)
 
     total_participant_count = 0
     actual_num_validators = 0
@@ -258,7 +234,7 @@ def deep_copy_participant(participant):
     for k, v in participant.items():
         if type(v) == type([]):
             part[k] = list(v)
-        else:    
+        else:
             part[k] = v
     return part