diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index c44518332b..7db72605ca 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -85,7 +85,11 @@
 
 - [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)
 
@@ -121,6 +125,8 @@
 
 - [Bach](https://github.com/danbax)
 
+- [@xccyxx](https://github.com/xccyxx)
+
 - [Idan B](https://github.com/idanbe)
 
 - [Deima Nongkseh](https://github.com/deima96)