Add two demo ascii casts
Name the merge with conflicts section back

Yes, it really has some conflicts.
Add 3 demo ascii casts and a meld screenshot