Implementation resource sharing, design saving stories
merge conflict