What is a Merge Conflict? [Advanced Git Tutorial]

What is a Merge Conflict? [Advanced Git Tutorial]