resolve conflict

ui/desktop/app/templates/scopes/scope/projects/targets/target/hosts.hbs

@@ -26,7 +26,13 @@
               <code>{{host.id}}</code>
             </Copyable>
           </row.cell>
-          <row.cell>{{host.attributes.address}}</row.cell>
+          <row.cell>
+            {{#if host.isStatic}}
+              {{host.address}}
+            {{else}}
+              &nbsp;
+            {{/if}}
+          </row.cell>
           <row.cell>
             <Rose::Button
               @style='secondary'