diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js.orig b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js.orig
index 749d001..9b622eb 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js.orig
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js.orig
@@ -195,13 +195,8 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
             $(".btn-annotation-rectangle").addClass("activebtncolor");
         }
         $rootScope.paintBrush = function () {
-<<<<<<< HEAD
       //      debugger;
               //  $('.btnCursor').addClass('activebtncolor');
-=======
-
-            $('.btnCursor').addClass('activebtncolor');
->>>>>>> db0b2ac40dc61ee08fb471800773516967978732
             $rootScope.switchCanvasToPaintCanvas();
             $rootScope.shapeType = "FreeStylePaint";
             var a = $("#amount-2").val();
@@ -304,6 +299,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
         $rootScope.shapestyle = function (id) {
 
             document.getElementById('modelbackground').style.display = "none";
+            document.getElementById('modeleditstyle').style.display = "none";
 
             $rootScope.shapestyleOpacity = $("#" + id).css('opacity');
             $rootScope.shapestyleFillColor = $("#" + id).parent().css('background-color');
@@ -325,20 +321,22 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
 
 
 =======
-            $('#editshapestyle').modal('hide');
->>>>>>> db0b2ac40dc61ee08fb471800773516967978732
+           // $('#editshapestyle').modal('hide');
+>>>>>>> 5bc4a80b843ca0ce3ce2fcff6378527e0aa407d7
         }
 
         $rootScope.enableAnnotationToolBar = function () {
 
             document.getElementById('modelbackground').style.display = "block";
-            $("#editshapestyle").modal('show');
+          //  $("#editshapestyle").modal('show');
+            document.getElementById('modeleditstyle').style.display = "block";
 
         }
 
         $rootScope.disableAnnotationToolBar = function () {
 
             document.getElementById('modelbackground').style.display = "none";
+            document.getElementById('modeleditstyle').style.display = "none";
 
         }