fixed merge issue in pom

Change-Id: Ib84f75f665b6f0733aba632bf3e6a8471cd56174