Merge conflicts have appeared in pom.xml. I am unsure how. Fix them.

Signed-off-by: Matthew Heon <mheon@redhat.com>