--- freem/ChangeLog	2025/05/16 13:22:57	1.173
+++ freem/ChangeLog	2025/05/18 20:40:34	1.179
@@ -1188,6 +1188,9 @@ VERSION 0.65.0-rc0
   * Return build configuration to default [snw@hesperos 05/14/25 09:30:06]
   * Fix linker error on errno symbol in locktab.c [snw@syrena.coherent-logic.com 05/14/25 20:49:12]
   * Remove old SEMK_ macros since ftok is now used throughout to determine semaphore keys [snw@syrena.coherent-logic.com 05/14/25 22:14:21]
+<<<<<<< ChangeLog
+  * Add back the refactored global handler [snw@eosphorus 05/16/25 21:57:48]
+=======
   * Make FreeM build on macOS on Apple Silicon [snw@primus.local 05/15/25 21:02:03]
   * Make shm seed NULL on ARM [snw@primus.local 05/15/25 21:24:58]
   * Fix macOS port [snw@primus.local 05/15/25 21:33:57]
@@ -1198,3 +1201,10 @@ VERSION 0.65.1-rc0
 
   * Change version from 0.65.0-rc0 to 0.65.1-rc0 [snw@syrena.coherent-logic.com 05/16/25 07:22:41]
   * Bump version to account for shared memory changes [snw@syrena.coherent-logic.com 05/16/25 07:23:00]
+>>>>>>> 1.173
+  * Add back the refactored global handler [snw@eosphorus 05/16/25 21:58:01]
+  * Make it possible to select the modernized global handler with the configure script and update documentation and README.md [snw@eosphorus 05/17/25 11:00:03]
+  * Update credits in README.md [snw@eosphorus 05/17/25 11:04:21]
+  * Add remove_freem.sh script [snw@eosphorus 05/17/25 13:35:28]
+  * Add ZEDIT command for editing routines [snw@eosphorus 05/18/25 12:15:37]
+  * Add ZEDIT to FreeM Manual [snw@eosphorus 05/18/25 14:40:34]