--- rxvt-unicode/Changes	2014/05/18 18:35:32	1.1151
+++ rxvt-unicode/Changes	2014/05/22 18:54:32	1.1152
@@ -33,7 +33,6 @@
 TODO IMPL: colour-change event with index
 TODO IMPL: recalc bg always on bg colour change
 
-<<<<<<< Changes
 TODO: document typical actions in rxvt.1.pod keysyms
 TODO: document meta comments.
 TODO: pelr one-liner, or bug µikachu for zsh oneliner.
@@ -43,6 +42,7 @@
 	- kuake extension now uses the kuake.hotkey resource to specify the hotkey.
 	- searchable-scrollback resource has been deprecated (use keysym instead).
         - extension parameter passing is deprecated (use resource mechanism instead).
+        - upgrade to GPLv3 (see COPYING).
 
 9.20 Sat Apr 26 16:22:27 CEST 2014
         - (libptytty) fix bug that prevented urxvtd from writing utmp