resolved nidhi's conflicts (pun intended)