Refactor story bootstrap
Fix merge conflict