Github Desktop Resolve Conflicts