CB Server: fix typos
fixed merge conflicts
Merge pull request #18 from amy-kurtzman/stage

Stage