docs: create a merge conflict#2

yapyuyou wants to merge 2 commits into

mainyiningsoong/hello-world:mainfrom

lucasyiningsoong/hello-world:lucasCopy head branch name to clipboard