Trying to fix conflict madness.