Resolving conflict in a healthy lasting manner takes time and energy.
You either have to care enough about the issue or the person for resolution to happen and last. The best start for this process is realizing most conflict is about perception.
On a daily basis I have to drive by a small lake that is east of the highway. The lake is brown and ugly. This is in West Texas and when I look east I literally think that is one of the ugliest lakes I've ever seen and I'm often offended at the pitiful sight. It probably doesn't help that I grew up with Lake Michigan as my view to the east, a Great Lake in many ways.
However when I look at the same lake from the shore looking west at sunset it is truly breathtaking.
Some evenings the way the water sparkles with the sun setting behind it is majestic: the same lake a different perspective.
Think about your conflict from east and west of the lake and listen before speaking.