Adjustments to fix build failures after rebase

Author: ahoppen

CodeGeneration/Sources/generate-swift-syntax/templates/swiftsyntaxbuilder/BuildableCollectionNodesFile.swift

@@ -11,21 +11,12 @@ structures in sync, this project generates code using the Swift package
 
 ## Regenerating Files
 
-<<<<<<< HEAD
-To re-generate the files after changing `CodeGeneration` run the `generate-swiftsyntax` 
+To re-generate the files after changing `CodeGeneration` run the `generate-swift-syntax`
 target of `CodeGeneration`.
 
 On the command line, this would be
 ```bash
-swift run --package-path CodeGeneration generate-swiftsyntax
-=======
-To re-generate the files after changing `CodeGeneration` run the `generate-swift-syntax` 
-target of `CodeGeneration` and pass `path/to/swift-syntax/Sources` as the argument.
-
-On the command line, this would be
-```bash
-swift run --package-path CodeGeneration generate-swift-syntax Sources
->>>>>>> 07c1ffaf (Renamed)
+swift run --package-path CodeGeneration generate-swift-syntax
 ```
 
 ## Adding and Removing Syntax Nodes

Sources/SwiftSyntax/Documentation.docc/Contributing/ChangingSwiftSyntax.md

@@ -1,4 +1,4 @@
-//// Automatically generated by generate-swiftsyntax
+//// Automatically generated by generate-swift-syntax
 //// Do not edit directly!
 //===----------------------------------------------------------------------===//
 //