merge booch