reconciling changes again