diff --git a/README.md b/README.md
index 50acfb33982ff45a1af216fd57fbfb7613e3376f..602b3f7b57a5003e921d68265c1d81d3a515b20b 100644
--- a/README.md
+++ b/README.md
@@ -30,10 +30,6 @@ interact in some way with the knowledge described in the docs:
 - [Memory and compute estimations](scripts/memory_compute_estimations/):
   Estimates and requirements for memory and compute for training large language
   models, given a number of tunable hyperparameters
-<<<<<<< HEAD
-
-=======
->>>>>>> a8370e8 (Added references to benchmarks in README)
 - [Benchmark Evaluation](benchmarks/):
   Contains evaluation code for benchmarking model performance.