With the formation of AAP government in 2024 the dispute between Chandigarh and SYL will end: Dr. Sushil Gupta