Client: Fixed merge