Former cricketer Harbhajan Singh is hopeful that the reported rift in the Indian team gets sorted out before next months Champions Trophy.