Git & GitHub: tell us about your first merge conflict

Everyone remembers their first merge conflict. After Git & GitHub for Beginners, or on your own projects:

• What caused it?
• What did you do, and did you make it worse before you made it better?
• What is one Git habit you now follow because of it?

If you have not hit one yet, ask here, and we will walk you through what it looks like before you meet it for real.