chatting about resolving conflicts on git