Working on last 2 slides
Fix conflict