fix conflict
Merge branch 'master' of https://github.com/lucasmg-dev/gum-front
add slider home