diff --git a/synfig-studio/src/gui/canvasview.cpp b/synfig-studio/src/gui/canvasview.cpp
index 8e2059e..543fa4a 100644
--- a/synfig-studio/src/gui/canvasview.cpp
+++ b/synfig-studio/src/gui/canvasview.cpp
@@ -301,18 +301,17 @@ public:
 	{
 		float cur_progress=(float)current/(float)total;
 		
-		if(cur_progress>0.0 && cur_progress<1.0)
+		if(cur_progress>0.0 && cur_progress<=1.0)
 		{
 			view->statusbar->hide();
 			view->progressbar->show();
 			view->progressbar->set_fraction((float)cur_progress);
 			return true;
 		}
-		if(cur_progress == 1.0)
-		{
+		
 			view->statusbar->show();
 			view->progressbar->hide();
-		}
+		
 		
 		if(!view->is_playing())
 		{
diff --git a/synfig-studio/src/gui/dialogs/vectorizersettings.cpp b/synfig-studio/src/gui/dialogs/vectorizersettings.cpp
index df2d52b..5ad0d82 100644
--- a/synfig-studio/src/gui/dialogs/vectorizersettings.cpp
+++ b/synfig-studio/src/gui/dialogs/vectorizersettings.cpp
@@ -281,7 +281,7 @@ VectorizerSettings::savecurrconfig()
 void
 VectorizerSettings::on_convert_pressed()
 {
-	
+	hide();
 	synfigapp::Action::Handle action(synfigapp::Action::create("Vectorization"));
 	std::cout<<"Action Created \n";
 	assert(action);
@@ -330,7 +330,6 @@ VectorizerSettings::on_convert_pressed()
 		return;
 	}
 	std::cout<<"Convert Pressed....";
-	one_moment.hide();
 }
 
 void
diff --git a/synfig-studio/src/synfigapp/actions/vectorization.cpp b/synfig-studio/src/synfigapp/actions/vectorization.cpp
index 3ae48f1..536d5f6 100644
--- a/synfig-studio/src/synfigapp/actions/vectorization.cpp
+++ b/synfig-studio/src/synfigapp/actions/vectorization.cpp
@@ -280,7 +280,7 @@ Action::Vectorization::perform()
  	    get_canvas_interface()->signal_layer_inserted()(new_layer,0); 
         get_canvas_interface()->signal_layer_moved()(new_layer,move_depth-1,get_canvas());
     } 
-
+    //ui_interface->amount_complete(2,1);//just to hide the progress bar
 }
 
 void
diff --git a/synfig-studio/src/synfigapp/vectorizer/centerlinevectorizer.cpp b/synfig-studio/src/synfigapp/vectorizer/centerlinevectorizer.cpp
index 68e86e7..8f8cac8 100644
--- a/synfig-studio/src/synfigapp/vectorizer/centerlinevectorizer.cpp
+++ b/synfig-studio/src/synfigapp/vectorizer/centerlinevectorizer.cpp
@@ -66,8 +66,12 @@ 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
  {
   std::cout<<"Inside CenterlineVectorize\n";
   VectorizerCoreGlobals globals;