Deleted site; bad conflict resolution