Try adding spaces in changelog to merge properly