Do nothing out of selfish ambition or vain conceit. Rather, in humility value others above yourselves, not looking to your own interests but each of you to the interests of others.
These verses point out what is perhaps more important than resolving conflict: how to keep from creating conflict. I do believe it is wrong to avoid conflict at all costs, because sometimes it is necessary. But if we try to be generous when we can be, and always fair, we will certainly experience less conflict than otherwise. I think understanding where another is coming from is the key.
Holy Lord, with the help of your Holy Spirit, may I see through the eyes of others, and avoid being selfish. May I prevent conflict with generosity and selflessness. Amen