Create a valid changelog with merges