fix merge conflicts

src/d/d_file_select.cpp

@@ -30,7 +30,6 @@
 #include "dusk/ui/modal.hpp"
 #include "dusk/ui/rando_config.hpp"
 #include "dusk/ui/ui.hpp"
-#endif
 
 namespace {
 constexpr u8 pointer_target(u8 group, u8 index) noexcept {

src/dusk/ui/button.cpp

@@ -23,6 +23,10 @@ Button::Button(Rml::Element* parent, Props props, const Rml::String& tagName)
     update_props(std::move(props));
 }
 
+Rml::String Button::get_text() {
+    return mProps.text;
+}
+
 void Button::set_text(const Rml::String& text) {
     if (mProps.text != text) {
         mRoot->SetInnerRML(escape(text));

src/dusk/ui/button.hpp

@@ -16,6 +16,7 @@ public:
     Button(Rml::Element* parent, Rml::String text, const Rml::String& tagName = "button")
         : Button(parent, Props{std::move(text)}, tagName) {}
 
+    Rml::String get_text();
     void set_text(const Rml::String& text);
     Button& on_pressed(ButtonCallback callback);