fix conflict setting