Fix salvage merge

Not yet ready for review/merge.