Updating slides with my content
Resolving merge conflicts