There are many ways to resolve conflict. Doing the work within your own consciousness may create a change in the way you both perceive the situation. Ho’oponopono and other releasing techniques can be very helpful. If you change your perspective (how you are seeing this), you may find that the outer situation will change.
In the meantime, try Angelic Intercession + if you have access.
also this: De-Inhabiter Combo