modified file_conflict