working on the db
fixed conflicts