added lava and water merge conflicts to registry