E

Exercise 02 - conflicting Merging