slider conflic images.
Merge pull request #2 from leovir086/feature_x

slider conflic images.