Conflicts could happen all the time.
It is important to communicate and come up with a solution together when both sides are calm.
Hope everything could be alright for your side, sometimes things are going to bad direction and makes the atmosphere depressing.