merge from baseline