docs: add CLI merge conflicts guide#30

Nomzy-kush wants to merge 1 commit intorezzcode:mainrezzcode/zoea-opensource:mainfrom

Nomzy-kush:docs/cli-merge-guideNomzy-kush/zoea-opensource:docs/cli-merge-guideCopy head branch name to clipboard