attempt to resolve confilct