Fix merge cruft in changelog