merge client and server subprojects