merge from d2