Race by Race
Resolve conflicts