fix: merge changes and fix conflicts

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt

@@ -313,9 +313,5 @@ class VisibleMessageView : LinearLayout {
         onPress?.invoke(rawX, rawY)
         pressCallback = null
     }
-
-    fun onContentClick() {
-        messageContentView.onContentClick?.invoke()
-    }
     // endregion
 }