Fix merge conflicts

ui/src/dashboards/components/DashboardHeader.js

@@ -64,7 +64,7 @@ const DashboardHeader = ({
               : null}
             {dashboard
               ? <div
-                  className={classnames('btn btn-info btn-sm', {
+                  className={classnames('btn btn-default btn-sm', {
                     active: showTemplateControlBar,
                   })}
                   onClick={onToggleTempVarControls}

ui/src/dashboards/components/DashboardHeaderEdit.js

@@ -46,7 +46,6 @@ class DashboardEditHeader extends Component {
               name="name"
               value={name}
               placeholder="Name this Dashboard"
-              value={name}
               onChange={e => this.handleChange(e.target.value)}
               onKeyUp={this.handleKeyUp}
               autoFocus={true}

ui/src/dashboards/components/TemplateControlBar.js

@@ -20,28 +20,6 @@ const TemplateControlBar = ({
               const selectedItem = items.find(item => item.selected) || items[0]
               const selectedText = selectedItem && selectedItem.text
 
-<<<<<<< HEAD
-        // TODO: change Dropdown to a MultiSelectDropdown, `selected` to
-        // the full array, and [item] to all `selected` values when we update
-        // this component to support multiple values
-        return (
-          <div key={id} className="template-control--dropdown">
-            <Dropdown
-              items={items}
-              buttonSize="btn-xs"
-              menuClass="dropdown-astronaut"
-              useAutoComplete={true}
-              selected={selectedText || '(No values)'}
-              onChoose={item =>
-                onSelectTemplate(id, [item].map(x => omit(x, 'text')))}
-            />
-            <label className="template-control--label">
-              {tempVar}
-            </label>
-          </div>
-        )
-      })}
-=======
               // TODO: change Dropdown to a MultiSelectDropdown, `selected` to
               // the full array, and [item] to all `selected` values when we update
               // this component to support multiple values
@@ -50,6 +28,7 @@ const TemplateControlBar = ({
                   <Dropdown
                     items={items}
                     buttonSize="btn-xs"
+                    menuClass="dropdown-astronaut"
                     useAutoComplete={true}
                     selected={selectedText || '(No values)'}
                     onChoose={item =>
@@ -72,7 +51,6 @@ const TemplateControlBar = ({
         <span className="icon cog-thick" />
         Manage
       </button>
->>>>>>> master
     </div>
   </div>
 )

ui/src/style/components/template-control-bar.scss

@@ -70,6 +70,7 @@ button.btn.template-control--manage {
     font-size: 12px;
     font-family: $code-font;
   }
+}
 .template-control--label {
   @include no-user-select();
   order: 1;