git-crash-course-en/images/branch-conflict-solved.odg