Resolved conflicts in ChangeLog