diff --git a/src/barchart/qbarchartseries.h b/src/barchart/qbarchartseries.h
index 118992b..5959a13 100644
--- a/src/barchart/qbarchartseries.h
+++ b/src/barchart/qbarchartseries.h
@@ -44,7 +44,6 @@ signals:
 public Q_SLOTS:
 
 private:
-
     BarChartModel* mModel;
 };
 
diff --git a/src/barchart/qpercentbarchartseries.h b/src/barchart/qpercentbarchartseries.h
index c5514d1..4a99888 100644
--- a/src/barchart/qpercentbarchartseries.h
+++ b/src/barchart/qpercentbarchartseries.h
@@ -45,7 +45,6 @@ public Q_SLOTS:
 
 
 private:
-
     BarChartModel* mModel;
 
 };
diff --git a/src/barchart/qstackedbarchartseries.h b/src/barchart/qstackedbarchartseries.h
index 925b047..167a38a 100644
--- a/src/barchart/qstackedbarchartseries.h
+++ b/src/barchart/qstackedbarchartseries.h
@@ -44,7 +44,6 @@ signals:
 public Q_SLOTS:
 
 private:
-
     BarChartModel* mModel;
 };
 
diff --git a/src/chartdataset.cpp b/src/chartdataset.cpp
index c8142c1..f9d8154 100644
--- a/src/chartdataset.cpp
+++ b/src/chartdataset.cpp
@@ -71,7 +71,10 @@ void ChartDataSet::addSeries(QChartSeries* series, QChartAxis *axisY)
             break;
         }
         case QChartSeries::SeriesTypeBar: {
+<<<<<<< HEAD
         qDebug() << "QChartSeries::SeriesTypeBar";
+=======
+>>>>>>> Common naming convention for barcharts
             QBarChartSeries* barSeries = static_cast<QBarChartSeries*>(series);
             qreal x = barSeries->countCategories();
             qreal y = barSeries->max();
diff --git a/src/src.pro b/src/src.pro
index aed8aa6..00acac6 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -52,6 +52,12 @@ PUBLIC_HEADERS += linechart/qlinechartseries.h \
     barchart/qbarchartseries.h \
     barchart/qstackedbarchartseries.h \
     barchart/qpercentbarchartseries.h \
+    barchart/barpresenter.h \
+    barchart/qstackedbarchartseries.h \
+    barchart/stackedbarpresenter.h \
+    barchart/qpercentbarchartseries.h \
+    barchart/percentbarpresenter.h \
+    barchart/barpresenterbase.h \
     barchart/qbarset.h \
     barchart/qbarcategory.h \
     qchartseries.h \