diff --git a/core/src/main/java/dev/triumphteam/gui/builder/item/BookBuilder.java b/core/src/main/java/dev/triumphteam/gui/builder/item/BookBuilder.java
index 6e395226..ea0b8c27 100644
--- a/core/src/main/java/dev/triumphteam/gui/builder/item/BookBuilder.java
+++ b/core/src/main/java/dev/triumphteam/gui/builder/item/BookBuilder.java
@@ -69,19 +69,8 @@ public BookBuilder author(@Nullable final Component author) {
             return this;
         }
 
-<<<<<<< Updated upstream
         bookMeta.setAuthor(Legacy.SERIALIZER.serialize(author));
         setMeta(bookMeta);
-=======
-        if (VersionHelper.IS_COMPONENT_LEGACY) {
-            bookMeta.setAuthor(Legacy.SERIALIZER.serialize(author));
-            setMeta(bookMeta);
-        } else {
-            bookMeta.setAuthor(Legacy.SERIALIZER.serialize(author));
-            setMeta(bookMeta);
-        }
-
->>>>>>> Stashed changes
         return this;
     }