merge explore tab into master