Fix merged