update project_model to project_db
update project_model to project_db, fix conflict