Update recovery to diff changes, Merge stock