diff --git a/components/components.pro b/components/components.pro
index ada5c06..2eb9daa 100644
--- a/components/components.pro
+++ b/components/components.pro
@@ -23,11 +23,8 @@ SOURCES = \
     qtmaterialcircularprogress.cpp \
     qtmaterialslider_internal.cpp \
     qtmaterialslider.cpp \
-<<<<<<< HEAD \
     qtmaterialsnackbar_internal.cpp \
-    qtmaterialsnackbar.cpp
-    qtmaterialsnackbar.cpp
-=======
+    qtmaterialsnackbar.cpp \
     qtmaterialradiobutton.cpp \
     qtmaterialtoggle_internal.cpp \
     qtmaterialtoggle.cpp \
@@ -37,7 +34,6 @@ SOURCES = \
     qtmaterialtabs.cpp \
     qtmaterialscrollbar_internal.cpp \
     qtmaterialscrollbar.cpp
->>>>>>> cleanup
 HEADERS = \
     qtmaterialavatar_p.h \
     qtmaterialavatar.h \
@@ -75,13 +71,9 @@ HEADERS = \
     qtmaterialslider_internal.h \
     qtmaterialslider_p.h \
     qtmaterialslider.h \
-<<<<<<< HEAD \
     qtmaterialsnackbar_internal.h \
     qtmaterialsnackbar_p.h \
-    qtmaterialsnackbar.h
-    qtmaterialsnackbar_p.h \
-    qtmaterialsnackbar.h
-=======
+    qtmaterialsnackbar.h \
     qtmaterialradiobutton_p.h \
     qtmaterialradiobutton.h \
     qtmaterialtoggle_internal.h \
@@ -96,6 +88,5 @@ HEADERS = \
     qtmaterialscrollbar_internal.h \
     qtmaterialscrollbar_p.h \
     qtmaterialscrollbar.h
->>>>>>> cleanup
 RESOURCES += \
     resources.qrc
diff --git a/components/qtmaterialsnackbar_internal.cpp b/components/qtmaterialsnackbar_internal.cpp
index 3c7ef12..a304f1a 100644
--- a/components/qtmaterialsnackbar_internal.cpp
+++ b/components/qtmaterialsnackbar_internal.cpp
@@ -1,7 +1,7 @@
-#include "xx/qtmaterialsnackbar_internal.h"
+#include "qtmaterialsnackbar_internal.h"
 #include <QPropertyAnimation>
-#include "xx/qtmaterialsnackbar.h"
-#include "xxlib/qtmaterialstatetransition.h"
+#include "qtmaterialsnackbar.h"
+#include "lib/qtmaterialstatetransition.h"
 #include <QDebug>
 
 QtMaterialSnackbarStateMachine::QtMaterialSnackbarStateMachine(QtMaterialSnackbar *parent)
diff --git a/examples/examples.pro b/examples/examples.pro
index 1c8fa4a..dda4c8d 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -15,7 +15,8 @@ SOURCES = mainwindow.cpp \
     radiobuttonsettingseditor.cpp \
     togglesettingseditor.cpp \
     textfieldsettingseditor.cpp \
-    tabssettingseditor.cpp
+    tabssettingseditor.cpp \
+    snackbarsettingseditor.cpp
 HEADERS = mainwindow.h \
     avatarsettingseditor.h \
     badgesettingseditor.h \
@@ -30,7 +31,8 @@ HEADERS = mainwindow.h \
     radiobuttonsettingseditor.h \
     togglesettingseditor.h \
     textfieldsettingseditor.h \
-    tabssettingseditor.h
+    tabssettingseditor.h \
+    snackbarsettingseditor.h
 LIBS += ../components/libcomponents.a
 INCLUDEPATH += ../components/
 TARGET = ../examples-exe
diff --git a/examples/mainwindow.cpp b/examples/mainwindow.cpp
index 81795c5..9a800eb 100644
--- a/examples/mainwindow.cpp
+++ b/examples/mainwindow.cpp
@@ -16,6 +16,7 @@
 #include "togglesettingseditor.h"
 #include "textfieldsettingseditor.h"
 #include "tabssettingseditor.h"
+#include "snackbarsettingseditor.h"
 
 MainWindow::MainWindow(QWidget *parent)
     : QMainWindow(parent)
@@ -49,6 +50,7 @@ MainWindow::MainWindow(QWidget *parent)
     ToggleSettingsEditor *toggle = new ToggleSettingsEditor;
     TextFieldSettingsEditor *textField = new TextFieldSettingsEditor;
     TabsSettingsEditor *tabs = new TabsSettingsEditor;
+    SnackbarSettingsEditor *snackbar = new SnackbarSettingsEditor;
 
     stack->addWidget(avatar);
     stack->addWidget(badge);
@@ -61,6 +63,7 @@ MainWindow::MainWindow(QWidget *parent)
     stack->addWidget(radioButton);
     stack->addWidget(raisedButton);
     stack->addWidget(slider);
+    stack->addWidget(snackbar);
     stack->addWidget(tabs);
     stack->addWidget(textField);
     stack->addWidget(toggle);
@@ -76,6 +79,7 @@ MainWindow::MainWindow(QWidget *parent)
     list->addItem("Radio Button");
     list->addItem("Raised Button");
     list->addItem("Slider");
+    list->addItem("Snackbar");
     list->addItem("Tabs");
     list->addItem("Text Field");
     list->addItem("Toggle");
diff --git a/examples/snackbarsettingseditor.cpp b/examples/snackbarsettingseditor.cpp
new file mode 100644
index 0000000..04f8dde
--- /dev/null
+++ b/examples/snackbarsettingseditor.cpp
@@ -0,0 +1,82 @@
+#include "snackbarsettingseditor.h"
+#include <QVBoxLayout>
+#include <QColorDialog>
+#include "qtmaterialsnackbar.h"
+
+SnackbarSettingsEditor::SnackbarSettingsEditor(QWidget *parent)
+    : QWidget(parent),
+      ui(new Ui::SnackbarSettingsForm),
+      m_snackbar(new QtMaterialSnackbar)
+{
+    QVBoxLayout *layout = new QVBoxLayout;
+    setLayout(layout);
+
+    QWidget *widget = new QWidget;
+    layout->addWidget(widget);
+
+    QWidget *canvas = new QWidget;
+    canvas->setStyleSheet("QWidget { background: white; }");
+    layout->addWidget(canvas);
+
+    ui->setupUi(widget);
+    layout->setContentsMargins(20, 20, 20, 20);
+
+    layout = new QVBoxLayout;
+    canvas->setLayout(layout);
+    canvas->setMaximumHeight(300);
+
+//    layout->addWidget(m_snackbar);
+//    layout->setAlignment(m_snackbar, Qt::AlignHCenter);
+
+//    setupForm();
+
+//    connect(ui->disabledCheckBox, SIGNAL(toggled(bool)), this, SLOT(updateWidget()));
+//    connect(ui->valueLineEdit, SIGNAL(textChanged(QString)), this, SLOT(updateWidget()));
+//    connect(ui->orientationComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(updateWidget()));
+//    connect(ui->invertedCheckBox, SIGNAL(toggled(bool)), this, SLOT(updateWidget()));
+//
+//    connect(m_slider, SIGNAL(valueChanged(int)), this, SLOT(setupForm()));
+}
+
+SnackbarSettingsEditor::~SnackbarSettingsEditor()
+{
+    delete ui;
+}
+
+void SnackbarSettingsEditor::setupForm()
+{
+//    switch (m_slider->orientation())
+//    {
+//    case Qt::Horizontal:
+//        ui->orientationComboBox->setCurrentIndex(0);
+//        break;
+//    case Qt::Vertical:
+//        ui->orientationComboBox->setCurrentIndex(1);
+//        break;
+//    default:
+//        break;
+//    }
+//
+//    ui->disabledCheckBox->setChecked(!m_slider->isEnabled());
+//    ui->valueLineEdit->setText(QString::number(m_slider->value()));
+//    ui->invertedCheckBox->setChecked(m_slider->invertedAppearance());
+}
+
+void SnackbarSettingsEditor::updateWidget()
+{
+//    switch (ui->orientationComboBox->currentIndex())
+//    {
+//    case 0:
+//        m_slider->setOrientation(Qt::Horizontal);
+//        break;
+//    case 1:
+//        m_slider->setOrientation(Qt::Vertical);
+//        break;
+//    default:
+//        break;
+//    }
+//
+//    m_slider->setDisabled(ui->disabledCheckBox->isChecked());
+//    m_slider->setValue(ui->valueLineEdit->text().toInt());
+//    m_slider->setInvertedAppearance(ui->invertedCheckBox->isChecked());
+}
diff --git a/examples/snackbarsettingseditor.h b/examples/snackbarsettingseditor.h
new file mode 100644
index 0000000..dad0199
--- /dev/null
+++ b/examples/snackbarsettingseditor.h
@@ -0,0 +1,26 @@
+#ifndef SNACKBARSETTINGSEDITOR_H
+#define SNACKBARSETTINGSEDITOR_H
+
+#include <QWidget>
+#include "ui_snackbarsettingsform.h"
+
+class QtMaterialSnackbar;
+
+class SnackbarSettingsEditor : public QWidget
+{
+    Q_OBJECT
+
+public:
+    explicit SnackbarSettingsEditor(QWidget *parent = 0);
+    ~SnackbarSettingsEditor();
+
+protected slots:
+    void setupForm();
+    void updateWidget();
+
+private:
+    Ui::SnackbarSettingsForm *const ui;
+    QtMaterialSnackbar       *const m_snackbar;
+};
+
+#endif // SNACKBARSETTINGSEDITOR_H