init project
solve conflict