[Client] Fixed merge bug