Get rid of CHANGELOG and other files interfering with a smooth merge from upstream