Resolve CONTRIBUTING.md

CONTRIBUTING.md

@@ -19,13 +19,6 @@ _This notice should stay as the first item in the CONTRIBUTING.MD file._
 - [Helping others](#helping-others)
 - [I want to contribute!](#i-want-to-contribute)
 - [Workflow labels](#workflow-labels)
-<<<<<<< HEAD
-- [Implement design & UI elements](#implement-design--ui-elements)
-- [Release retrospective and kickoff](#release-retrospective-and-kickoff)
-  - [Retrospective](#retrospective)
-  - [Kickoff](#kickoff)
-- [Issue tracker](#issue-tracker)
-=======
   - [Type labels (~"feature proposal", ~bug, ~customer, etc.)](#type-labels-feature-proposal-bug-customer-etc)
   - [Subject labels (~wiki, ~"container registry", ~ldap, ~api, etc.)](#subject-labels-wiki-container-registry-ldap-api-etc)
   - [Team labels (~CI, ~Discussion, ~Edge, ~Platform, etc.)](#team-labels-ci-discussion-edge-platform-etc)
@@ -34,7 +27,6 @@ _This notice should stay as the first item in the CONTRIBUTING.MD file._
 - [Implement design & UI elements](#implement-design--ui-elements)
 - [Issue tracker](#issue-tracker)
   - [Issue triaging](#issue-triaging)
->>>>>>> 6ce1df41e175c7d62ca760b1e66cf1bf86150284
   - [Feature proposals](#feature-proposals)
   - [Issue tracker guidelines](#issue-tracker-guidelines)
   - [Issue weight](#issue-weight)
@@ -43,13 +35,8 @@ _This notice should stay as the first item in the CONTRIBUTING.MD file._
   - [Stewardship](#stewardship)
 - [Merge requests](#merge-requests)
   - [Merge request guidelines](#merge-request-guidelines)
-<<<<<<< HEAD
   - [Getting your merge request reviewed, approved, and merged](#getting-your-merge-request-reviewed-approved-and-merged)
   - [Contribution acceptance criteria](#contribution-acceptance-criteria)
-- [Changes for Stable Releases](#changes-for-stable-releases)
-=======
-  - [Contribution acceptance criteria](#contribution-acceptance-criteria)
->>>>>>> 6ce1df41e175c7d62ca760b1e66cf1bf86150284
 - [Definition of done](#definition-of-done)
 - [Style guides](#style-guides)
 - [Code of conduct](#code-of-conduct)