A couple tweaks
Fixed conflict