build
build
merged client and server repositories