diff --git a/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/CallMenuController.java b/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/CallMenuController.java
index 42686c717..d69695690 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/CallMenuController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/CallMenuController.java
@@ -125,12 +125,18 @@ public class CallMenuController extends BaseController implements FlexibleAdapte
 
         if (menuType.equals(MenuType.REGULAR)) {
             if (!TextUtils.isEmpty(room.getDisplayName())) {
+<<<<<<< Updated upstream
                 menuItems.add(new MenuItem(
                         getResources().getString(
                                 R.string.nc_configure_named_room, room.getDisplayName()), 0, null));
             } else if (!TextUtils.isEmpty(room.getName())) {
                 menuItems.add(new MenuItem(getResources().getString(
                         R.string.nc_configure_named_room, room.getName()), 0, null));
+=======
+                menuItems.add(new MenuItem(room.getDisplayName(), 0, null));
+            } else if (!TextUtils.isEmpty(room.getName())) {
+                menuItems.add(new MenuItem(room.getName(), 0, null));
+>>>>>>> Stashed changes
             } else {
                 menuItems.add(new MenuItem(getResources().getString(R.string.nc_configure_room), 0, null));
             }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a726d746f..29d446797 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -85,7 +85,6 @@
     <!-- Room menu -->
     <string name="nc_start_conversation">Start a conversation</string>
     <string name="nc_configure_room">Configure conversation</string>
-    <string name="nc_configure_named_room">%1$s</string>
     <string name="nc_leave">Leave conversation</string>
     <string name="nc_rename">Rename conversation</string>
     <string name="nc_set_password">Set a password</string>
@@ -145,7 +144,6 @@
     <string name="nc_share_text_pass">\nPassword: %1$s</string>
 
     <!-- Magical stuff -->
-    <string name="nc_empty"></string>
     <string name="nc_push_to_talk">Push-to-talk</string>
     <string name="nc_push_to_talk_desc">With microphone disabled, click&amp;hold to use Push-to-talk</string>
     <string name="nc_store_short_desc">Have private video calls and chat using your own server.</string>