The basics of advanced merge and merge conflicts webinar