rm db
Merge branch 'confing'