remove confilict