diff --git a/libs/ui/opengl/kis_opengl_canvas2.h b/libs/ui/opengl/kis_opengl_canvas2.h
index dc4062cf92..283162d618 100644
--- a/libs/ui/opengl/kis_opengl_canvas2.h
+++ b/libs/ui/opengl/kis_opengl_canvas2.h
@@ -1,129 +1,121 @@
 /*
  * Copyright (C) Boudewijn Rempt <boud@valdyas.org>, (C) 2006
  * Copyright (C) Michael Abrahams <miabraha@gmail.com>, (C) 2015
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #ifndef KIS_OPENGL_CANVAS_2_H
 #define KIS_OPENGL_CANVAS_2_H
 
 #include <QOpenGLWidget>
 #include <QOpenGLFunctions_3_0>
 #include <QOpenGLFunctions_3_2_Core>
 #include "canvas/kis_canvas_widget_base.h"
 #include "opengl/kis_opengl_image_textures.h"
 
 #include "kritaui_export.h"
 #include "kis_ui_types.h"
 
 class KisCanvas2;
 class KisDisplayColorConverter;
 class QOpenGLShaderProgram;
 class QPainterPath;
 
 #ifndef Q_MOC_RUN
 #ifndef Q_OS_MAC
 #define GLFunctions QOpenGLFunctions_3_0
 #else
 #define GLFunctions QOpenGLFunctions_3_2_Core
 #endif
 
 #endif
 /**
  * KisOpenGLCanvas is the widget that shows the actual image using OpenGL
  *
  * NOTE: if you change something in the event handling here, also change it
  * in the qpainter canvas.
  *
  */
-<<<<<<< HEAD
-class KRITAUI_EXPORT KisOpenGLCanvas2 : public QOpenGLWidget
-        , public KisCanvasWidgetBase
-        , protected QOpenGLFunctions_3_2_Core
- {
-=======
 class KRITAUI_EXPORT KisOpenGLCanvas2
         : public QOpenGLWidget
 #ifndef Q_MOC_RUN
         , protected GLFunctions
 #endif
         , public KisCanvasWidgetBase
 {
-
->>>>>>> a257e33... Better way to force the 3.2 core functions for OSX
     Q_OBJECT
 
 public:
 
     KisOpenGLCanvas2(KisCanvas2 *canvas, KisCoordinatesConverter *coordinatesConverter, QWidget *parent, KisImageWSP image, KisDisplayColorConverter *colorConverter);
 
     virtual ~KisOpenGLCanvas2();
 
 public: // QOpenGLWidget
 
     void resizeGL(int width, int height);
     void initializeGL();
     void paintGL();
 
     virtual QVariant inputMethodQuery(Qt::InputMethodQuery query) const;
     virtual void inputMethodEvent(QInputMethodEvent *event);
 
 public:
     void renderCanvasGL();
     void renderDecorations(QPainter *painter);
     void paintToolOutline(const QPainterPath &path);
 
     bool needsFpsDebugging() const;
 
 public: // Implement kis_abstract_canvas_widget interface
     void initializeShaders();
     void setDisplayFilter(QSharedPointer<KisDisplayFilter> displayFilter);
     void setWrapAroundViewingMode(bool value);
     void channelSelectionChanged(const QBitArray &channelFlags);
     void setDisplayProfile(KisDisplayColorConverter *colorConverter);
     void finishResizingImage(qint32 w, qint32 h);
     KisUpdateInfoSP startUpdateCanvasProjection(const QRect & rc, const QBitArray &channelFlags);
     QRect updateCanvasProjection(KisUpdateInfoSP info);
 
     QWidget *widget() {
         return this;
     }
 
     bool isBusy() const;
 
     void setDisplayFilterImpl(QSharedPointer<KisDisplayFilter> displayFilter, bool initializing);
 
     KisOpenGLImageTexturesSP openGLImageTextures() const;
 
 private Q_SLOTS:
     void slotConfigChanged();
 
 protected: // KisCanvasWidgetBase
     virtual bool callFocusNextPrevChild(bool next);
 
 private:
     void reportFailedShaderCompilation(const QString &context);
     void drawImage();
     void drawCheckers();
 
 private:
 
     struct Private;
     Private * const d;
 
 };
 
 #endif // KIS_OPENGL_CANVAS_2_H