Resolve merge conflict
New: -D switch for use in play-story command
New: -P switch for use in play-story