carousel working but not too pretty though
merge successful