- worked on expanded listview details
- fixed conflicts