fixup! docs: add generation schematics option docs

Author: jbogarthyde

packages/schematics/angular/guard/schema.json

@@ -21,11 +21,7 @@
     },
     "flat": {
       "type": "boolean",
-<<<<<<< HEAD
-      "description": "Flag to indicate if a directory is created.",
-=======
       "description": "When true (the default), creates the new files at the top level of the current project.",
->>>>>>> fixup! docs: add generation schematics option docs
       "default": true
     },
     "path": {