diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl
index 4257f1dd85..f69679d3f3 100644
--- a/templates/swagger/v1_json.tmpl
+++ b/templates/swagger/v1_json.tmpl
@@ -4049,7 +4049,7 @@
             "$ref": "#/responses/notFound"
           },
           "409": {
-            "$ref": "#/responses/error"
+            "$ref": "#/responses/conflict"
           },
           "422": {
             "$ref": "#/responses/validationError"
@@ -18036,7 +18036,7 @@
         },
         "head_sha": {
           "type": "string",
-          "x-go-name": "HeadSha"
+          "x-go-name": "HeadSHA"
         },
         "id": {
           "type": "integer",