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