(basic) Merge conflict #1
Delete (master) Merge conflict #1
Tested $ git log -p