Finished up the course conflict resolution screen.