Remove a conflict in file