Merge master and client projects