modify the ffalot
ff allot
repair conflict
modify the tree structure