Added chances to Chris.txt
Fixed conflict