made some changes
testimonials resize
resolved conflicts