Resolve merge conflict

Cleaned up a merge conflict in the changelog that was preventing the file from being properly formatted.