merge branches pt2