Description

Note that there are some conflicts that you cannot avoid (they’re "necessary conflicts"), but there are some conflicts you can skip. Here’s how to do it.