semi-regular merge