Fix merge conflicts in client.py