CHG: Resolve conflicts on Mac