fix pagination on portfolio and testimonial page when they are set as front page
fix conflict after pull from remote server