Small tweaks to conflicts guide