add static root
solve conflict