Corrected merge problems in changelog.