merging recovery stuff