Resolve merge conflict and clarify scope usage

Author: dharapandya85

CONTRIBUTING.md

@@ -7,20 +7,11 @@ Thank you for your interest in contributing to `patch-hub`! This document outlin
 1. [Code of Conduct](#code-of-conduct)
 2. [Getting Started](#getting-started)
 3. [Development Workflow](#development-workflow)
-<<<<<<< HEAD
-4. [Coding Style](#coding-style)
-5. [Commit Guidelines](#commit-guidelines)
-6. [Pull Request Guidelines](#pull-request-guidelines)
-7. [Issue Reporting](#issue-reporting)
-8. [Communication](#communication)
-=======
 4. [Commit Guidelines](#commit-guidelines)
 5. [Pull Request Guidelines](#pull-request-guidelines)
 6. [Issue Reporting](#issue-reporting)
 7. [License](#license)
 
->>>>>>> 8571767 (docs(contributing): clarify commit guidelines structure)
-
 ## Code of Conduct
 
 `patch-hub` adheres to the [Contributor Covenant of the Linux Kernel](https://docs.kernel.org/process/code-of-conduct.html) development community. In general, we expect all developers to: