Added option to remove conflicts from protocol