na
fix conflicts
adapter expandable