add select ability
fix conflicts