refix confilct file