fixed bad merge on the timeout screen