conflicting change from a mac
Resolving conflicts