salvage fishkin comprise, merge to master