init project
solve the confilct