Git Scientist: Merge Conflict An exercise from the Git for Scientists course. See https://www.gitscientist.com for more.