Re: [PATCH v2] docs: add backporting and conflict resolution document