conflict is such a strong word - it may just be a simple misunderstanding or a misjudgement on one side. either way all can be resolved through time - the span is dictated with guts of each party.

Positively, it strenghtens relationships for both realize their weaknesses and how it affects them. just like an old saying, blood strengthens the bond, with bond being the problem not actually real blood ofcourse hehehe.. but its ok too if you ended from a bloody fist fight haha...

negatively, it can break your relationship totally if you dont submit, or accept submission. If submitting be true to it and not just say sorry but feel sorry too. If accepting submission, learn how to forgive and submit yourself aswell, keep in mind that submitting is very hard.

so.... my conclusion - let time come in as a factor to healing but act first if able. do not assume anything negative - its ok to assume positively though. It doesnt have to be a formal resolution as when you party with a group or you go out... you will just notice yourself sharing laughter with him/her...

or if your brave enough to endure one on one with the other party - do so but do it as if nothing has happened.