update confilct file