init
solve conflict