Answer:
resolve it
Step-by-step explanation:
if you make a mistake that causes conflict you should always try to resolve it
5.7m questions
7.4m answers