remove confilct file