Fix pom merge error
Merge pull request #204 from andylyall/develop

Fix pom merge error