diff --git a/generate/input/descriptor.json b/generate/input/descriptor.json
index e007440c6..76679337d 100644
--- a/generate/input/descriptor.json
+++ b/generate/input/descriptor.json
@@ -998,7 +998,20 @@
           }
         },
         "git_index_conflict_add": {
-          "isAsync": true,
+          "args": {
+            "index": {
+              "isSelf": true
+            },
+            "ancestor_entry": {
+              "isOptional": true
+            },
+            "our_entry": {
+              "isOptional": true
+            },
+            "their_entry": {
+              "isOptional": true
+            }
+          },
           "return": {
             "isErrorCode": true
           }