support reverting individual entities - makes conflict resolution work