fix prev next item choose
merge