fixed error FrindTable
merge