1. resolve some conflict