Clean up Misleading merge conflict error

[dkirrane]

[ERROR] Auto-merging my-proj/pom.xml
[ERROR] CONFLICT (content): Merge conflict in my-proj/pom.xml
[ERROR] Automatic merge failed; fix conflicts and then commit the result.
[ERROR] -> [Help 1]
[ERROR]
[ERROR] To see the full stack trace of the errors, re-run Maven with the -e swit
ch.
[ERROR] Re-run Maven using the -X switch to enable full debug logging.
[ERROR]
[ERROR] For more information about the errors and possible solutions, please rea
d the following articles:
[ERROR] [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/MojoFailureExc
eption
[ERROR]
[ERROR] After correcting the problems, you can resume the build with the command

[ERROR]   mvn <goals> -rf :my-proj