diff --git a/src/forms/configwidget.ui b/src/forms/configwidget.ui
index 725967d..668e67e 100644
--- a/src/forms/configwidget.ui
+++ b/src/forms/configwidget.ui
@@ -7,7 +7,11 @@
     <x>0</x>
     <y>0</y>
     <width>520</width>
+<<<<<<< Updated upstream
     <height>405</height>
+=======
+    <height>432</height>
+>>>>>>> Stashed changes
    </rect>
   </property>
   <property name="windowTitle">