Finalize CONTRIBUTING.md

Let's finalize our CONTRIBUTING.md according to our needs.

AC

• Describe how to handle merges in the solution architecture repo