carousel
fix conflict