added explanation to first slide
fixed conflict