custom listview
merge conflixt fixed