Removes erroneous conflict file