more diff reconciling