merge from base