Fix errors when store carousel doesn't exist
Fix conflict