slider conflict main page.
Merge branch 'leovir086-feature'