Client: Fixed bad merge