conflicting change from a mac