Here's how to properly resolve conflicts =D

Coub Auto Road Conflict Good league Solution