conflict - on end