Chandni is the one that Nahar fell in love with, and is now posing as Devika in front of the family.
Devika is the one that came to Rajasthan with Nahar and met the entire family and the one that Kaki pushed off the cliff.
Now she is standing in front of the family claiming to be Chandni, the one that married Nahar.