Fix file conflicts