1 files changed, 4 insertions, 0 deletions

diff --git a/README.md b/README.md
index ad107561..90314c58 100644
--- a/README.md
+++ b/README.md
@@ -116,9 +116,13 @@ cd ~/.config/nvim && git pull
 > "I have the processing power of a potato with 4 gb of ram and LunarVim runs perfectly."
 > - @juanCortelezzi, LunarVim user.
 
+<<<<<<< HEAD
+
+=======
 <div align="center">
 	
 [![Lua](https://img.shields.io/badge/Made%20with%20Lua-blue.svg?style=for-the-badge&logo=lua)]()
 	
 	
 </div>
+>>>>>>> 68bfac0468ea4d5d7faf5bede0a4ab8cb5572f0c