chartoff slides
merge conflict