test
updated db seed script
fixed merge conflict