Testimonials component
Fixing merge conflict