For merge conflict training purposes