Fixed merge conflicts in client