diff --git a/pom.xml b/pom.xml
index fd35b8fe6c5..e7f0ad7da20 100644
--- a/pom.xml
+++ b/pom.xml
@@ -97,7 +97,7 @@
 
         <asm.version>9.0</asm.version>
         <lombok.version>1.18.16</lombok.version>
-        <protocollib.version>4.7.0-SNAPSHOT</protocollib.version>
+        <protocollib.version>4.7.0</protocollib.version>
         <spigot.version>[1.17,]</spigot.version>
         <junit.version>4.13.1</junit.version>
         <paper-api.version>[1.16,]</paper-api.version>
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 41ec7705f1e..26d63a3fa54 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -57,8 +57,6 @@ commands:
     aliases: [dmodify, dmod, disgmodify, modifydisguise, moddisguise, mdisguise]
     permission: libsdisguises.seecmd.disguisemodify
     description: Modify your own disguise
-<<<<<<< HEAD
-=======
   disguisemodifyplayer:
     aliases: [dmodifyplayer, dmodplayer, disgmodifyplayer, dismodplayer, disgmodplayer, modifydisguiseplayer,
               moddisguiseplayer, mdisguiseplayer, mdisgplayer, dmodifyuuid, dmoduuid, disgmodifyuuid, dismoduuid, disgmoduuid, modifydisguiseuuid,
@@ -70,7 +68,6 @@ commands:
               moddisguiseradius, mdisguiseradius, moddisgradius]
     permission: libsdisguises.seecmd.disguisemodifyradius
     description: Modify disguises in a radius
->>>>>>> 8ca5fd862a0ede80ec7732d3746322bd4176f8ea
   disguisemodifyentity:
     aliases: [dmodifyentity, dmodentity, disgmodentity, dismodentity, modifydisguiseentity, modifydisgentity,
               modifydentity, moddisguiseentity, moddisgentity, mdisguiseentity, mdisgentity]