There will be discomfort in daily life but now there will be no new lockdown: CM Rupani