diff --git a/webapp/pages/profile/_id/_slug.vue b/webapp/pages/profile/_id/_slug.vue
index 7b9394897..6f042a4f7 100644
--- a/webapp/pages/profile/_id/_slug.vue
+++ b/webapp/pages/profile/_id/_slug.vue
@@ -344,10 +344,7 @@ export default {
     HcLoadMore,
     HcEmpty,
     ContentMenu,
-<<<<<<< HEAD
     HcUpload
-=======
->>>>>>> 9d1dfe6067280b792b752b46608e443aa3925616
   },
   transition: {
     name: 'slide-up',