removed git merge stuff

calls  to swiper needs to be redone still some js errors but at least
the page runs