Removing conflicts from CHANGES.txt

While working on the install, I noticed that conflicts were checked into CHANGES.txt. I resolved the conflicts and also fixed up the formatting in places.