docs: Fix typos and improve merge conflicts text
Passed
Victor Löfgren
created pipeline for commit
1931cf16
, finished
For dev
2 minutes 0 seconds, queued for 6 seconds