Fix example/pom.xml (remove merge annotations)
Merge pull request #2 from GeertJohan/patch-1

Fix example/pom.xml (remove merge annotations)