added carousel
fixed conflicts