merge speartail changes