fixed replies
Merge branch 'master' of https://github.com/c-rhodes/collab
fix story conflict