slider arrow in gallery activity
main activity changes
conflicts removed