File:EditConflict2.png