diff --git a/scripts/tmux-parallel-push.sh b/scripts/tmux-parallel-push.sh
index 73c28aabd1e7481b4a85b701be4e68a7d53d9fb4..9a1cbc1e34768c98dbc82e343b3af7853659913b 100755
--- a/scripts/tmux-parallel-push.sh
+++ b/scripts/tmux-parallel-push.sh
@@ -51,6 +51,15 @@
 
 cd $LOG_DIR;
 wc -l * | sort -n | tee line-counts.txt;
+
+MERGE_ERR=$(grep -rnw './' -e "Merge conflict");
+if [[ -n ${MERGE_ERR} ]];
+then
+    echo; echo "It looks there were some errors. Review merge-conflicts.txt for more information."; echo;
+    echo "$MERGE_ERR" > ./merge-conflicts.txt;
+else
+    echo; echo "No automatic merge issues detected. Success?"; echo;
+fi
 cd ..;
 
 echo; echo; echo "Sleeping for 11 more seconds..."; echo; echo;