Ignore file conflicts