New conflict stuff - not completed