modifed pom
Fiexed merge conflict