fixed merge booch