Fixes merge conflicts.

src/main/java/world/bentobox/bentobox/BentoBox.java

@@ -466,6 +466,7 @@ public class BentoBox extends JavaPlugin implements Listener {
 
         log("Saving default panels...");
         this.saveResource("panels/island_creation_panel.yml", false);
+        this.saveResource("panels/language_panel.yml", false);
         return true;
     }
 

src/main/resources/locales/en-US.yml

@@ -1745,6 +1745,19 @@ panels:
         name: "&l [name]"
         description: |-
           [description]
+  # The section of translations used in Language Panel
+  language:
+    title: "&2&l Select your language"
+    buttons:
+      # This button is used for displaying different locales that are available in language selection panel.
+      language:
+        name: "&f&l [name]"
+        description: |-
+          [authors]
+          |[selected]
+        authors: "&7 Authors: "
+        author: "&7 - &b [name]"
+        selected: "&a Currently selected."
   # The set of common buttons used in multiple panels.
   buttons:
     # Button that is used in multi-page GUIs which allows to return to previous page.