refactoring final slide
merging conflicts