Merge Conflcits in poms