Updated label_queen_conflicts function (#967)

Shortened it, finding conflicts separately and storing them in different variables has no use later in the notebook; so i believe this looks better.