Story line controls
Fix merge conflict
Multiple story lines