Resolving conflict with GitHub Mac.