You know, last night when I first watched the episode, that hug scene between Dev and Shiva I didn't like cause I thought it felt like they were doing it just for show to please GauRa.
I literally just rewatched it (fresh mind) and now I think it's less force and more compromise. As in, no matter how much they fight, they are willing to put those differences aside for their family and their happiness...