enhanced merge conflict testing
merge conflict trigger
merge conflict, make sure to have multiple conflicts
Merge branch 'master' of github.com:tom-weiss-github/home