fixed mentor select
merge