Added client banner and testimonials
Fixed conflicts