Minor tweaks to create conflict