diff --git a/webapp/components/notifications/NotificationPostCard.vue b/webapp/components/notifications/NotificationPostCard.vue
index 90ded90c1..85049b0c3 100644
--- a/webapp/components/notifications/NotificationPostCard.vue
+++ b/webapp/components/notifications/NotificationPostCard.vue
@@ -28,7 +28,7 @@
 </template>
 
 <script>
-import HcUser from '~/components/User.vue'
+import HcUser from '~/components/User'
 
 export default {
   name: 'HcPostCard',
diff --git a/webapp/store/auth.js b/webapp/store/auth.js
index 1b18a6594..f5290a925 100644
--- a/webapp/store/auth.js
+++ b/webapp/store/auth.js
@@ -83,28 +83,26 @@ export const actions = {
             role
             about
             locationName
-<<<<<<< HEAD
-            notifications(read: false, orderBy: createdAt_desc) {
-              id
-              read
-              createdAt
-              post {
-                author {
-                  id
-                  slug
-                  name
-                  disabled
-                  deleted
-                }
-                title
-                contentExcerpt
-                slug
-              }
-=======
             socialMedia {
               id
               url
->>>>>>> f6eb5474d1d8ff180daa5f7f73e3375cff95b2de
+            }
+          }
+          notifications(read: false, orderBy: createdAt_desc) {
+            id
+            read
+            createdAt
+            post {
+              author {
+                id
+                slug
+                name
+                disabled
+                deleted
+              }
+              title
+              contentExcerpt
+              slug
             }
           }
         }`)