Reverted some changes

Makefile

@@ -141,7 +141,7 @@ clean-local:
 check-merges-reproducibility:
 	@echo "Running replay_merge for each idx in parallel using GNU Parallel..."
 	@set -e; \
-	tail -n +2 $(CSV_RESULTS) | awk -F, '{print $$1}' | parallel --halt now,fail=1 -j 50% python3 src/python/replay_merge.py -delete_workdir --idx {}
+	tail -n +2 $(CSV_RESULTS) | awk -F, '{print $$1}' | parallel --halt now,fail=1 -j 50% src/python/replay_merge.py --testing --merges_csv $(CSV_RESULTS) -skip_build -delete_workdir --idx {}
 
 protect-repos:
 	find repos -mindepth 1 -type d -exec chmod a-w {} +

src/scripts/merge_tools/intellimerge.sh

@@ -58,14 +58,12 @@ for file in $conflict_files; do
     fi
 done
 
-# report conflicts
-conflict_markers=$(grep -rE '^(<<<<<<<|=======|>>>>>>>$)' "$clone_dir" | wc -l)
-if [ "$conflict_markers" -ne "$initial_conflict_markers" ]; then
-    echo "intellimerge.sh"
-    echo "Conflict markers changed"
-    echo "Initial conflict markers: $initial_conflict_markers"
-    echo "Final conflict markers: $conflict_markers"
-    echo "Conflict detected"
+# If conflicts_resolved is false, there are unresolved conflicts
+if [ "$conflicts_resolved" = false ]; then
+    echo "Conflict detected. Aborting the merge. Please resolve the conflicts."
+    echo "All conflicting files:"
+    echo "$conflict_files"
+    rm -rf $temp_out_dir $temp_intellimerge_dir
     exit 1
 fi