--- a/CHANGELOG	Fri Apr 06 20:13:27 2018 +0530
+++ b/CHANGELOG	Fri Apr 06 20:00:43 2018 +0530
@@ -15,7 +15,8 @@
   * templatekw: remove `obsfatedata` templatekw. Individuals fields are
     available in core as single template functions.
 
->>>>>>> source: 35349a1debab stable - boris: templatekw: remove obsfatedata t...
+  * fixed issue 5833 and 5832
+
 7.3.0 -- 2018-03-21
 ---------------------