fixed merge issue with GalleryListActivity