corect merge