comment out project error
resolve conflict in project model
add sqlite3 to gemfile