deleting conflict file