resolve master merging code example

Example: show conflicts git

git diff --name-only --diff-filter=U