merge in skiplist changes