diff --git a/README.md b/README.md
index 58feefa..7dacbef 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,31 @@
+<<<<<<< HEAD
# NoDropX
Give no drop items!
+=======
+
+
+
+# NoDropX
+**Give no drop items!**
+
+The plugin will allow you to create items that will not drop out of your inventory at death!
+
+Give an no drop item: `/nodrop give [player] [item] (count)`
+Check all plugin commands: https://github.com/iRedTea/NoDropX/wiki/Commands
+Plugin wiki: https://github.com/iRedTea/NoDropX/wiki
+SpigotMC resource: https://www.spigotmc.org/resources/nodropx.111485/
+
+**Features**
+- Supports HEX Colors (MiniMessages and MD5 ChatColor)
+- Supports all versions from 1.12.2 to 1.20.1 (Spigot/Paper/Folia)
+- No drop items storage: `/nodrop gui`
+- Fully customization
+- Items that protect other slots from death
+- Developer API
+- Mods support (tested on Arclight 1.16.5)
+- ItemsAdder support
+- Folia support
+
+
+This plugin uses CarcadeX library
+>>>>>>> c885fc87da46aa8dfde40471c5bf17c2a0ffa762