resolve merge conflict

public/app/features/admin/partials/users.html

@@ -2,11 +2,11 @@
 
 <div class="page-container page-body">
   <div class="page-action-bar">
-    <div class="gf-form">
-      <label class="gf-form-label">Search</label>
-      <input class="gf-form-input width-15" type="text" placeholder="Find user by name/login/email" tabindex="1" give-focus="true"
+    <label class="gf-form gf-form--grow gf-form--has-input-icon">
+      <input type="text" class="gf-form-input max-width-30" placeholder="Find user by name/login/email" tabindex="1" give-focus="true"
         ng-model="ctrl.query" ng-model-options="{ debounce: 500 }" spellcheck='false' ng-change="ctrl.getUsers()" />
-    </div>
+      <i class="gf-form-input-icon fa fa-search"></i>
+    </label>
     <div class="page-action-bar__spacer"></div>
     <a class="btn btn-success" href="admin/users/create">
       <i class="fa fa-plus"></i>