diff --git a/README.md b/README.md
index c7ada92..a291058 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # DSL
 
-Explore our Data Structure Lab repo: codes, lab manuals, write-ups. Ace your assignments with practical examples and clear guidance.
+Explore our Data Structure Lab repository: codes, lab manuals, write-ups. Ace your assignments with practical examples and clear guidance.
 
 ---
 
@@ -15,18 +15,8 @@ In this repository, you'll find codes for Data Structure Lab.
 5. [DSL - Assignment 5 (String)](https://git.kska.io/sppu-se-comp-codes/DSL/src/branch/main/assignment-5.py)
 11. DSL - Assignment 11 (Linear, Sentinel, Binary, Fibonnaci Search) - _PENDING_
 14. [DSL - Assignment 14 (Selection, Bubble Sorting)](https://git.kska.io/sppu-se-comp-codes/DSL/src/branch/main/assignment-14.py)
-<<<<<<< HEAD
 16. [DSL - Assignment 16 (Quick sort)](https://git.kska.io/sppu-se-comp-codes/DSL/src/branch/main/assignment-16.py)
-29. [DSL - Assignment 29 (Queue job)](https://git.kska.io/sppu-se-comp-codes/DSL/src/branch/main/assignment-29.cpp)
-
-=======
-<<<<<<< HEAD
-16. [DSL - Assignment 16 (Quick sort)](https://git.kska.io/sppu-se-comp-codes/DSL/src/branch/main/assignment-16.cpp)
-=======
-16. [DSL - Assignment 16 (Quick sort)](https://git.kska.io/sppu-se-comp-codes/DSL/src/branch/main/assignment-16.py)
-29. [DSL - Assignment 29 (Queue Job)](https://git.kska.io/sppu-se-comp-codes/DSL/src/branch/main/assignment-29.py)
->>>>>>> fc6d144 (Added link for assignment-29 to README)
->>>>>>> 6b6c0d1 (Added assignment 29 (queue job))
+29. [DSL - Assignment 29 (Queue Job)](https://git.kska.io/sppu-se-comp-codes/DSL/src/branch/main/assignment-29.cpp)
 
 ### Write-ups
 
@@ -63,11 +53,7 @@ In this repository, you'll find codes for Data Structure Lab.
 > These are the codes we're working on. They *may not work* the way intended.
 > To view all the codes that are being built, checkout the [testing branch](https://git.kska.io/sppu-se-comp-codes/DSL/src/branch/testing).
 
-<<<<<<< HEAD
-**ALL TESTING CODES HAVE BEEN MERGED IN MAIN BRANCH.**
-=======
 **ALL TESTING CODES HAVE BEEN MERGED IN THE MAIN BRANCH.**
->>>>>>> 6b6c0d1 (Added assignment 29 (queue job))
 
 ---