diff --git a/src/widget/friendwidget.h b/src/widget/friendwidget.h
index 0b86c814d..50a455428 100644
--- a/src/widget/friendwidget.h
+++ b/src/widget/friendwidget.h
@@ -57,13 +57,7 @@ protected:
     void setFriendAlias();
 
 public:
-<<<<<<< HEAD
     const Friend* frnd;
-||||||| merged common ancestors
-=======
-    Friend* frnd;
->>>>>>> refactor(friendwidget): FriendWidget refactoring
-    int friendId;
     bool isDefaultAvatar;
     bool historyLoaded;
 };