fix mixed plans merging data plans; issue #802