Ensure that edit in mergeConflict conflicts
Ensure that edit in mergeConflict conflicts

uid/gitstream-exercises,uid/gitstream-exercises,uid/gitstream-exercises,uid/gitstream-exercises,uid/gitstream-exercises,uid/gitstream-exercises,uid/gitstream-exercises,uid/gitstream-exercises,uid/gitstream-exercises,uid/gitstream-exercises