fix merge conflicts

Signed-off-by: Kartikay <[email protected]>

Author: kartikaysaxena

pkg/schemadsl/dslshape/zz_generated.nodetype_string.go

@@ -10,7 +10,7 @@ NodeTypeFile
       child-node =>
         NodeTypeError
           end-rune = 12
-          error-message = Unknown use flag: `something`. Options are: expiration, deprecation, typechecking
+          error-message = Unknown use flag: `something`. Options are: deprecation, expiration, typechecking
           error-source = 
 
           input-source = invalid use