changed db from sqlite3 to pg
merge conflict