[Update] Remove conflict from Dhiraj