The best way to resolve conflict is to meet in person. Especially if you use Thich Nhat Hanh's “Beginning Anew.” It is a sequence of sharing appreciation, regret, and then requests. The focus is on improving the relationship by nurturing honesty and empathy so that your requests are true requests, not camouflaged demands.