fix db
Merge branch 'awesome-time'

* awesome-time:
  fix db
db conflicts