diff --git a/homeassistant/components/knx/translations/en.json b/homeassistant/components/knx/translations/en.json
index 43aeced6698..beff8cecd00 100644
--- a/homeassistant/components/knx/translations/en.json
+++ b/homeassistant/components/knx/translations/en.json
@@ -47,13 +47,9 @@
                 "data": {
                     "connection_type": "KNX Connection Type",
                     "individual_address": "Default individual address",
-<<<<<<< HEAD
-=======
                     "local_ip": "Local IP of Home Assistant (use 0.0.0.0 for automatic detection)",
->>>>>>> b9247f3952 (Fix local_ip handling in KNX options flow (#62969))
                     "multicast_group": "Multicast group used for routing and discovery",
                     "multicast_port": "Multicast port used for routing and discovery",
-                    "local_ip": "Local IP (leave empty if unsure)",
                     "rate_limit": "Maximum outgoing telegrams per second",
                     "state_updater": "Globally enable reading states from the KNX Bus"
                 }
diff --git a/tests/components/shelly/test_device_trigger.py b/tests/components/shelly/test_device_trigger.py
index 73f92ca9640..238fb9b0336 100644
--- a/tests/components/shelly/test_device_trigger.py
+++ b/tests/components/shelly/test_device_trigger.py
@@ -198,7 +198,7 @@ async def test_get_triggers_non_initialized_devices(hass):
     expected_triggers = []
 
     triggers = await async_get_device_automations(
-        hass, DeviceAutomationType.TRIGGER, coap_wrapper.device_id
+        hass, "trigger", coap_wrapper.device_id
     )
 
     assert_lists_same(triggers, expected_triggers)