Removes conflict in file