Fix conflicted files
Updated slides