Added a test for CheckForTie
Fixed some conflicts