Merge Cricket's recent changes