fixed the collection slider view and resolved conflicts