removed a conflict file