Fix merged case