Same

source/_components/homekit.markdown

@@ -103,8 +103,7 @@ homekit:
                 description: Code to `arm / disarm` an alarm or `lock / unlock` a lock. Only applicable for `alarm_control_panel` or `lock` entities.
                 required: false
                 type: string
-<<<<<<< HEAD
-                default: ''
+                default: '`<No code>`'
               feature_list:
                 description: Only for `media_player` entities. List of feature dictionaries to add for a given entity. Comparable to the platform schema.
                 required: false
@@ -119,9 +118,6 @@ homekit:
                 required: false
                 type: string
                 default: switch
-=======
-                default: '`<No code>`'
->>>>>>> origin/current
 {% endconfiguration %}
 
 <p class='note'>