Updated mergeConflict exercise for repo autogen