Fern-fir-fur merger

Summary