From 3f855f3883a830f8b709c785bef711c5aadd4478 Mon Sep 17 00:00:00 2001
From: Ezra <ezra96@outlook.com>
Date: Tue, 25 May 2021 18:30:34 -0500
Subject: [PATCH] fix style import conflict

---
 app/styles/app.scss | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

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