add equipment selector
fix conflicts after merge