diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 7db72605ca..58ed6b2f1e 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -85,11 +85,7 @@
 
 - [Harun Adil](https://github.com/HarunAdil)
 
-<<<<<<< HEAD
 - [Ramon R](https://github.com/artboycat)
-=======
-\_ [Ramon R](https://github.com/artboycat)
->>>>>>> e53ac7d9c (added my name to contributor list)
 
 - [Muhammad Asim](https://github.com/MRGLOBIN)
 
@@ -3965,6 +3961,8 @@
 
 - [@Jclem28](https://github.com/jclem28)
 
+- [@J3Technology](https://github.com/J3Technology)
+
 - [@Jcon306](https://github.com/jcon306)
 
 - [@Jcpkoruna](https://github.com/jcpkoruna)
@@ -11044,7 +11042,7 @@
 
 - [@muzungor](https://github.com/muzungor)
 
-- [@tusharkumar2302](https://github.com/tusharkumar2302) 
+- [@tusharkumar2302](https://github.com/tusharkumar2302)
 
 - [@olajuw](https://github.com/olajuw)