Fix merge conflict syntax in changelog