Removing the conflict in the file