some mac tests
Resolving conflicts