Fix version conflicts caused by PR#507#509

sucrose0413 wants to merge 1 commit intoProjectEKA:masterProjectEKA/hip-service:masterfrom

sucrose0413:mastersucrose0413/hip-service:masterCopy head branch name to clipboard