i don't think so... ivy spits out something that is already conflict resolved