diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 426ca6654a..e440f8b1b3 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -34,8 +34,12 @@ Other Ppl
 
 Date		Added
 ======
+<<<<<<< .mine
+11/20
+	* Fixed spawns on umbala fields [shadow]
 11/21
 	* niflheim.txt: some typos in some variables fixed (thx 2 Dr.Evil) [Lupus]
+
 11/19
 	* cmd_fild02.gat: fixed respawn delay of one Seal [Lupus]
 	* ev_agit_event.txt: Implemented Shadowlady's idea of allowing different woe start/stop times