Fix merged error