diff --git a/src/components/ChatComponents/ChatProfile.vue b/src/components/ChatComponents/ChatProfile.vue
index 8c309a4aed96ad91b05fc8af0ffc3b1b50109300..f09eb7bcec1fb744963bd8ac02d3596db1829191 100644
--- a/src/components/ChatComponents/ChatProfile.vue
+++ b/src/components/ChatComponents/ChatProfile.vue
@@ -52,13 +52,7 @@ export default {
   },
   methods: {
     selectUser() {
-<<<<<<< HEAD
-      console.log(this.conversation?.recipient.userId);
       this.$emit("recipient", this.conversation?.recipient.userId);
-=======
-      //console.log(this.conversation.recipient.userId);
-      this.$emit("recipient", this.conversation.recipient.userId);
->>>>>>> 3fd875332a013afe5b731aa96a2e2c2ce2351891
     },
   },
   created() {