fix file conflicts