Fixed leftover conflict in Action View's CHANGELOG entry.