correct merge