merging-conflict-exercise-completed