diff --git a/app/qrcoderesponse.py b/app/qrcoderesponse.py
index 915faaf..0c8c6e5 100644
--- a/app/qrcoderesponse.py
+++ b/app/qrcoderesponse.py
@@ -11,9 +11,15 @@
 DEFAULT_BG_COLOR = "#ffffff"
 MIN_PIXEL_WIDTH = 1
 MAX_PIXEL_WIDTH = 100
+<<<<<<< Updated upstream
 DEFAULT_LOGO_SCALE = 20
 MIN_LOGO_SCALE = 5
 MAX_LOGO_SCALE = 30
+=======
+DEFAULT_LOGO_SCALE = 15
+MIN_LOGO_SCALE = 5
+MAX_LOGO_SCALE = 20
+>>>>>>> Stashed changes
 
 
 def _pixel_width_from_env():
diff --git a/app/templates/index.html b/app/templates/index.html
index 9bbc74e..88b4a4f 100644
--- a/app/templates/index.html
+++ b/app/templates/index.html
@@ -29,9 +29,16 @@
 
                         <label class="form-label mt-3" for="logo_scale">Logo size:</label>
                         <div class="logo-slider-wrap">
+<<<<<<< Updated upstream
                             <input class="form-range" type="range" id="logo_scale" name="logo_scale" min="5" max="30" step="1" value="20">
                             <span id="logo-scale-value">20%</span>
                         </div>
+=======
+                            <input class="form-range" type="range" id="logo_scale" name="logo_scale" min="5" max="20" step="1" value="15">
+                            <span id="logo-scale-value">15%</span>
+                        </div>
+                        <small class="text-light d-block mt-2">For scan reliability, logo size is capped at 20%.</small>
+>>>>>>> Stashed changes
                     </form>
                     <div class="device-container"></div>
                     <div class="iphone-mockup"></div>
diff --git a/tests/test_app.py b/tests/test_app.py
index 3ff2d16..cff10af 100644
--- a/tests/test_app.py
+++ b/tests/test_app.py
@@ -8,6 +8,7 @@
     sys.path.insert(0, APP_DIR)
 
 from main import app  # noqa: E402
+from qrcoderesponse import DEFAULT_LOGO_SCALE, MAX_LOGO_SCALE, _normalized_logo_scale  # noqa: E402
 
 
 class QRCodeAppTestCase(unittest.TestCase):
@@ -41,6 +42,12 @@ def test_qr_returns_png_for_valid_text(self):
         self.assertEqual(response.mimetype, "image/png")
         self.assertTrue(response.data.startswith(b"\x89PNG"))
 
+    def test_logo_scale_is_clamped_to_maximum(self):
+        self.assertEqual(_normalized_logo_scale("999"), MAX_LOGO_SCALE)
+
+    def test_logo_scale_uses_new_default(self):
+        self.assertEqual(_normalized_logo_scale(None), DEFAULT_LOGO_SCALE)
+
 
 if __name__ == "__main__":
     unittest.main()