diff --git a/manifest.scm b/manifest.scm
index b16155c..2a13869 100644
--- a/manifest.scm
+++ b/manifest.scm
@@ -1,7 +1,4 @@
-<<<<<<< HEAD
-(specifications->manifest '("emacs-eldev"))
-=======
 (packages->manifest
  (list
-  (specification->package "emacs-eldev")))
->>>>>>> d9c1ac7 (Add manifest.scm for easy dev environment with Guix)
+  (specification->package "emacs-eldev")
+  (specification->package "emacs-htmlize")))