fixed merge conflict and carousels not display only 5 items by last updated
fixed image merge conflict...not really though