added lightbox gallery method
resolved conflicts