* ChangeLog: Remove conflict markers.