merge correct