deal with file
 conflict