Answer:
Ignore the conflict
Step-by-step explanation:
Once you are conscient that there is a conflict with someone you can take two approaches to the matter, you could ignore the conflict and try to solve it by yourself or just not do anything at all, and the other option is to confront the person and try to solve the problem dialoguing with them, that is usually the best option, to start a dialogue with the person with which you have a conflict.