diff --git a/synfig-studio/src/synfigapp/vectorizer/centerlinevectorizer.cpp b/synfig-studio/src/synfigapp/vectorizer/centerlinevectorizer.cpp
index 3c29d9b..c492df8 100644
--- a/synfig-studio/src/synfigapp/vectorizer/centerlinevectorizer.cpp
+++ b/synfig-studio/src/synfigapp/vectorizer/centerlinevectorizer.cpp
@@ -66,12 +66,8 @@ inline void deleteSkeletonList(SkeletonList *skeleton) {
 // takes two arguments ( image layer handle, config )
 
 std::vector< etl::handle<synfig::Layer> > 
-<<<<<<< HEAD
-VectorizerCore::centerlineVectorize(etl::handle<synfig::Layer_Bitmap> &image,const etl::handle<UIInterface> &ui_interface
- const CenterlineConfiguration &configuration,const Gamma &gamma)
-=======
-VectorizerCore::centerlineVectorize(etl::handle<synfig::Layer_Bitmap> &image,const etl::handle<synfigapp::UIInterface> &ui_interface,const CenterlineConfiguration &configuration)
->>>>>>> update:progress bar working
+VectorizerCore::centerlineVectorize(etl::handle<synfig::Layer_Bitmap> &image,const etl::handle<synfigapp::UIInterface> &ui_interface, 
+const CenterlineConfiguration &configuration,const Gamma &gamma)
  {
   std::cout<<"Inside CenterlineVectorize\n";
   VectorizerCoreGlobals globals;
@@ -114,7 +110,7 @@ VectorizerCore::centerlineVectorize(etl::handle<synfig::Layer_Bitmap> &image,con
 }
 
 std::vector< etl::handle<synfig::Layer> > 
-VectorizerCore::vectorize(const etl::handle<synfig::Layer_Bitmap> &img,const etl::handle<UIInterface> &ui_interface, const VectorizerConfiguration &c, const Gamma &gamma) 
+VectorizerCore::vectorize(const etl::handle<synfig::Layer_Bitmap> &img,const etl::handle<synfigapp::UIInterface> &ui_interface, const VectorizerConfiguration &c, const Gamma &gamma) 
 {
   std::vector< etl::handle<synfig::Layer> > result;
 
diff --git a/synfig-studio/src/synfigapp/vectorizer/centerlinevectorizer.h b/synfig-studio/src/synfigapp/vectorizer/centerlinevectorizer.h
index 1d08905..50577af 100644
--- a/synfig-studio/src/synfigapp/vectorizer/centerlinevectorizer.h
+++ b/synfig-studio/src/synfigapp/vectorizer/centerlinevectorizer.h
@@ -70,10 +70,10 @@ public:
 
   /*!Calls the appropriate technique to convert \b image to vectors depending on c.*/
  
-  std::vector< etl::handle<synfig::Layer> > vectorize(const etl::handle<synfig::Layer_Bitmap> &image, const etl::handle<UIInterface> &ui_interface,const VectorizerConfiguration &c,const synfig::Gamma &gamma);
+  std::vector< etl::handle<synfig::Layer> > vectorize(const etl::handle<synfig::Layer_Bitmap> &image, const etl::handle<synfigapp::UIInterface> &ui_interface,const VectorizerConfiguration &c,const synfig::Gamma &gamma);
 
 private:
-  std::vector< etl::handle<synfig::Layer> > centerlineVectorize(Handle &image, const CenterlineConfiguration &configuration, const synfig::Gamma &gamma);
+  std::vector< etl::handle<synfig::Layer> > centerlineVectorize(Handle &image,const etl::handle<synfigapp::UIInterface> &ui_interface, const CenterlineConfiguration &configuration, const synfig::Gamma &gamma);
 
 };