resolve conflicts

Signed-off-by: Feynman Zhou <[email protected]>

docs/proposals/formatted-output.md

@@ -92,7 +92,7 @@ For example, when using `oras manifest fetch` with the flag `--format`, the foll
   - `config`: a content descriptor describes the disposition of the targeted content
   - `layers`:  array of objects, each object in the array MUST be a descriptor
 
-See example use cases of formatted output for `oras manifest fetch`:
+See sample use cases of formatted output for `oras manifest fetch`:
 
 - Example: use `--output <file>` and `--format` at the same time, a manifest file should be produced in the filesystem and the `mediaType` value should be outputted on the console: