diff --git a/app/styles/app.scss b/app/styles/app.scss
index b4921a2..a2cc896 100644
--- a/app/styles/app.scss
+++ b/app/styles/app.scss
@@ -11,8 +11,6 @@
 
 @import "components/footer";
 
-<<<<<<< HEAD
-@import "components/verse";
-=======
-@import "components/user-guide"
->>>>>>> master
+@import "components/user-guide";
+
+@import "components/verse";
\ No newline at end of file