//first merge from B1