resolve file conflicts