conflict leftover bit in CHANGES.txt