Fixed removal of conflicts, it was appending to the file instead of overwriting.