confilts
Merge branch 'master' of https://github.com/iamcooc/sample_app