spireland - fixes risky merge