Removing conflicts from CHANGES.txt
Merge pull request #424 from nunit/issue-changes-conflict

Removing conflicts from CHANGES.txt