diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index b797d5d..184703a 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,7 +1,5 @@
-<<<<<<< HEAD
+v1.0.237: Fixed Pause Bug
 v1.0.236: Fixed Pause bug
-=======
->>>>>>> 9b0a806796fc418c65387d092c7ce525ae4da93d
 v1.0.235: Improved Serial Buffer check
 v1.0.234: Added check for USB Selective Suspend to Troubleshooting tab, improved simulation of arcs, Fixed right-click menu in Gcode Editor
 v1.0.233: Cleanup code