resolve merge conflict
Merge branch 'staging' of https://github.com/balaf/bloodline-starter into staging