first merge from B2