Resolved conflict in changelog