Fixing merge conflicts

Author: jonathan-buttner

output/schema/schema.json

@@ -494,4 +494,4 @@
     }
   },
   "generalErrors": []
-}
+}