Add lesson on handling conflicts

[Cali0707]

A useful skill is how to resolve conflicts. We should add a lesson that:

• Explains what a conflict is
• Explains when/why conflicts may happen
• Explains how to resolve conflicts