bogus db changes from previous conflict resolution