merging-confllict-exercise