remove file conflict