project init
fix conflict