Console Output

+ git merge --ff appng-template-1.14.4-release
Auto-merging pom.xml
CONFLICT (content): Merge conflict in pom.xml
Automatic merge failed; fix conflicts and then commit the result.