fixing target file conflicts