7 sliders added
Resolved conflicts