init project
fix ignore conflict