fixed merge issue

dist/swagger-ui.js

@@ -655,7 +655,7 @@ function program13(depth0,data) {
 function program14(depth0,data) {
   
   var buffer = "", stack1;
-  buffer += "\n        <option value='";
+  buffer += "\n        <option selected=\"\" value='";
   if (stack1 = helpers.value) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
   else { stack1 = depth0.value; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
   buffer += escapeExpression(stack1)

src/main/template/param_list.handlebars

@@ -13,7 +13,7 @@
     {{/if}}
     {{#each allowableValues.descriptiveValues}}
       {{#if isDefault}}
-        <option value='{{value}}'>{{value}} (default)</option>
+        <option selected="" value='{{value}}'>{{value}} (default)</option>
       {{else}}
         <option value='{{value}}'>{{value}}</option>
       {{/if}}