[Issue: 235716] Pass verbosity to git-merge, Change output from stdout to stderr for merge conflict