merge the stash
fix the client to match the new server API