CHANGES.txt changed

Added info that was conflicted again