fixed AlpineRescue constructors, pair programming
fixed merge conflicts