Merge branch 'main' into issue-322-documentation-site

Author: goldcaddy77

README.md

@@ -254,7 +254,6 @@ Note that the examples in the [examples](./examples/README.md) folder use relati
 </p>
 </details>
 
-<<<<<<< HEAD
 ## Contributing
 
 PRs accepted, fire away! Or add issues if you have use cases Warthog doesn't cover.
@@ -275,8 +274,6 @@ Warthog is intentionally opinionated to accelerate development and make use of t
 - Jest - other harnesses will work, but if you use Jest, we will not open the GraphQL playground when the server starts, for example.
 - Soft deletes - no records are ever deleted, only "soft deleted". The base service used in resolvers filters out the deleted records by default.
 
-=======
->>>>>>> chore(docz): adds docz documentation site
 ## Thanks
 
 Special thanks to: