add project generate by yeoman
fix conflict