changes resolved list and grid view
removed conflict in files