Removed a conflict marker left after a merge from CHANGES.txt