Conflict, is where two opposing factors meet head on, for example, disagreeing, maybe arguing, with someone, and resolution is the solution behind the conflict in order to prevent it from happening, to prevent further disagreement.
Conflict is something that is best avoided as it can be unpleasant to experience, however if you do find yourself or someone you care about in conflict, finding a resolution, a solution, that is peaceful, and that helps everyone is the best way to assure that it doesn’t happen again.