There are some things you can do to move through a conflict in a productive way, rather than letting it become time consuming, emotional, expensive and frustrating. Resolve them at the earliest possible opportunity. It also keeps you up fewer nights. Our memories also have a way of magnifying things- making them better or worse than they seemed at the time. Decide What's Important First of all, ensure that the conflict is something worth spending your energy on.
Conflict can be an exhausting process, even when it ends well.
Don't waste your energy on anything that isn't worth it to you. You may decide that an issue is merely irritating, but not worth a confrontation or negotiation. Don't back down on anything that is important to you, by any objective criteria. But don't make a conflict out of a trivial item. People tend to paint things with a broad brush, especially when they're annoyed.