More selectively fix ignoring conflicted artifacts.