In regards to this, we see a small preview of the conflict starting in the wedding dais, when they're called up by Gautam, Shiva has a look of almost disgust for his brother's actions (note I don't think Shiva or Dev will ever have it in them to hate the other) and the way the stand across from each other is like boxers in a ring... Usually we see couples standing next to each other when there are multiple marriages happening at the same time, never across from each other (at least on TV, this is the first that I've seen this type of multi wedding in one mandap).
Very true! Shiva’s reprimand for Dev was lurking in the backdrop from a long time during the wedding and also with their travel to the Haveli. I assume there was an initial plan to take this route, but then everything changed because of the lockdown. If you remember the initial bus scenes were also hinted towards their conflict.