AW: Ignore file conflicts