resolve conflicts

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

docs/proposals/formatted-output.md

@@ -77,7 +77,7 @@ jobs:
 
 ## Proposal and desired user experience
 
-Enable users to use the `--format` flag to format metadata output into structured data (e.g. JSON) and optionally use the `--template` with the [Go template functions](https://pkg.go.dev/text/template) to manipulate the output data.
+Enable users to use the `--format` flag to format metadata output into structured data (e.g. JSON) and optionally use the `--template` with the [Go template](https://pkg.go.dev/text/template) to manipulate the output data.
 
 ### oras manifest fetch