feature diff mixes entities being compared