update service jars
resolve merge conflict