diff --git a/contributors.md b/contributors.md
index 0c145d1..296b46c 100644
--- a/contributors.md
+++ b/contributors.md
@@ -74,8 +74,5 @@ Thank you to all contributors:
 * [Dennis Birkholz](https://github.com/dennisbirkholz)
 * [Anton Tyurin](https://github.com/noxiouz)
 * [Bogdan Kulbida](https://github.com/kulbida)
-<<<<<<< HEAD
 * [Matt Hudgins](https://github.com/mhudgins)
-=======
 * [Ruth Grace Wong](https://github.com/ruthgrace)
->>>>>>> fixed grammar mistakes in linux-bootstrap-4.md, Long mode section