Updated slides
Resolved conflicts, updated slides