resolved conflicts in ClientMain
git rebase attempt 2