solve conflict on merge solicitation code example

Example: git find merge conflicts

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