resolve confilts