solving file conflicts