merge from hasadna