Moving up conflicts

NEXT