diff --git a/include/vmprofiles.hpp b/include/vmprofiles.hpp
index 57717ea..6a23a2f 100644
--- a/include/vmprofiles.hpp
+++ b/include/vmprofiles.hpp
@@ -75,11 +75,6 @@ namespace vm::handler
         SHLD_W,
         SHLDB,
 
-        SHRDQ,
-        SHRDW,
-        SHRD_W,
-        SHRDB,
-
         SHRQ,
         SHRDW,
         SHRW,
@@ -87,7 +82,8 @@ namespace vm::handler
 
         NANDQ,
         NANDDW,
-        NANDW
+        NANDW,
+        NANDB
     };
 
     /// <summary>
@@ -167,15 +163,10 @@ namespace vm::handler
 
         extern vm::handler::profile_t shlq;
         extern vm::handler::profile_t shldw;
-<<<<<<< HEAD
         extern vm::handler::profile_t shlw;
 
         extern vm::handler::profile_t shldq;
-=======
-
->>>>>>> 573cc04fc1804ac328b555bb1136d132d858a6fe
         extern vm::handler::profile_t shlddw;
-        extern vm::handler::profile_t shrddw;
 
         extern vm::handler::profile_t nandq;
         extern vm::handler::profile_t nanddw;
@@ -184,7 +175,6 @@ namespace vm::handler
 
         extern vm::handler::profile_t writeq;
         extern vm::handler::profile_t writedw;
-        extern vm::handler::profile_t writew;
         extern vm::handler::profile_t writeb;
 
         extern vm::handler::profile_t readq;
@@ -216,13 +206,8 @@ namespace vm::handler
             &lconstbsxdw, &lconstbsxq, &lconstdwsxq, &lconstwsxq, &lconstwsxdw, &lconstdw, &lconstw, &addq,
             &adddw,       &addw,       &addb,        &popvsp,
 
-<<<<<<< HEAD
             &shlq,        &shldw,      &shlw,        &writeq,     &writedw,     &writeb,   &nandq,   &nanddw,
             &nandw,       &nandb,
-=======
-            &shlq,       &shldw,       &writeq,     &writedw,     &writew,   &writeb,  &nandq,      &nanddw,
-            &nandw,      &nandb,
->>>>>>> 573cc04fc1804ac328b555bb1136d132d858a6fe
 
             &shlddw,      &shldq,