remove select-picker
merge --no-ff CBluowei-master