Fixed file conflicts