two db migrations and attempt to set time to PST
merging db migrations
merged db migrations and a few other things