diff --git a/package.json b/package.json
index d56d7c0..e44d662 100644
--- a/package.json
+++ b/package.json
@@ -1,11 +1,6 @@
 {
 	"name": "@pressbooks/pressbooks-aldine",
-<<<<<<< HEAD
-
-	"version": "1.2.1",
-=======
 	"version": "1.5.0",
->>>>>>> dev
 	"author": "Pressbooks (Book Oven Inc.) <code@pressbooks.com>",
 	"homepage": "https://github.com/pressbooks/pressbooks-aldine/",
 	"description":