test confict. 2
Merge branch 'master' of github.com:xingmin/stayhomedb