added comments to stories
fixed merge conflicts
merge fixes