merge client and servier subprojects