diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.roles/public/js/role-listing.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.roles/public/js/role-listing.js
index 576f0e67dfb..ca06c183def 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.roles/public/js/role-listing.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.roles/public/js/role-listing.js
@@ -32,10 +32,11 @@ $(function () {
 });
 
 var apiBasePath = "/api/device-mgt/v1.0";
-var modalPopup = ".wr-modalpopup";
-var modalPopupContainer = modalPopup + " .modalpopup-container";
-var modalPopupContent = modalPopup + " .modalpopup-content";
+var modalPopup = ".modal";
+var modalPopupContainer = modalPopup + " .modal-content";
+var modalPopupContent = modalPopup + " .modal-content";
 var body = "body";
+var isInit = true;
 $(".icon .text").res_text(0.2);
 
 
@@ -51,8 +52,8 @@ function setPopupMaxHeight() {
  * show popup function.
  */
 function showPopup() {
-    $(modalPopup).show();
-    setPopupMaxHeight();
+    $(modalPopup).modal('show');
+    //setPopupMaxHeight();
 }
 
 /*
@@ -60,9 +61,12 @@ function showPopup() {
  */
 function hidePopup() {
     $(modalPopupContent).html('');
-    $(modalPopup).hide();
+    $(modalPopup).modal('hide');
+    $('body').removeClass('modal-open').css('padding-right','0px');
+    $('.modal-backdrop').remove();
 }
 
+
 /**
  * Following function would execute
  * when a user clicks on the list item
@@ -176,42 +180,7 @@ function loadRoles() {
 
 }
 
-<<<<<<< HEAD:components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.listing/public/js/role-listing.js
-var modalPopup = ".modal";
-var modalPopupContainer = modalPopup + " .modal-content";
-var modalPopupContent = modalPopup + " .modal-content";
-var body = "body";
-var isInit = true;
-
 
-/*
- * set popup maximum height function.
- */
-function setPopupMaxHeight() {
-    $(modalPopupContent).css('max-height', ($(body).height() - ($(body).height() / 100 * 30)));
-    $(modalPopupContainer).css('margin-top', (-($(modalPopupContainer).height() / 2)));
-}
-
-/*
- * show popup function.
- */
-function showPopup() {
-    $(modalPopup).modal('show');
-    //setPopupMaxHeight();
-}
-
-/*
- * hide popup function.
- */
-function hidePopup() {
-    $(modalPopupContent).html('');
-    $(modalPopup).modal('hide');
-    $('body').removeClass('modal-open').css('padding-right','0px');
-    $('.modal-backdrop').remove();
-}
-
-=======
->>>>>>> bdb5b970fdf87856317a8e719487643d0cb823f5:components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.roles/public/js/role-listing.js
 /**
  * Following click function would execute
  * when a user clicks on "Remove" link
@@ -250,4 +219,4 @@ $("#role-grid").on("click", ".remove-role-link", function () {
 
 $(document).ready(function () {
     loadRoles();
-});
\ No newline at end of file
+});
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/users.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/users.hbs
index 3bb674218d6..e92c667caba 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/users.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/users.hbs
@@ -160,7 +160,6 @@
     </div>
 
     <div id="remove-user-modal-content" class="hide">
-<<<<<<< HEAD
         <div class="modal-header">
             <h3 class="pull-left modal-title">
                 Remove User
@@ -176,21 +175,6 @@
             <div class="buttons">
                 <a href="#" id="remove-user-yes-link" class="btn-operations">Remove</a>
                 <a href="#" id="remove-user-cancel-link" class="btn-operations">Cancel</a>
-=======
-        <div class="content">
-            <div class="row">
-                <div class="col-lg-5 col-md-6 col-centered">
-                    <h3>Do you really want to remove this user ?</h3>
-                    <div class="buttons">
-                        <a href="#" id="remove-user-yes-link" class="btn-operations">
-                            Remove
-                        </a>
-                        <a href="#" id="remove-user-cancel-link" class="btn-operations">
-                            Cancel
-                        </a>
-                    </div>
-                </div>
->>>>>>> bdb5b970fdf87856317a8e719487643d0cb823f5
             </div>
         </div>
     </div>
@@ -238,7 +222,6 @@
     </div>
 
     <div id="errorUsers" class="hide">
-<<<<<<< HEAD
         <div class="modal-header">
             <h3 class="pull-left modal-title">
                 <span class="fw-stack">
@@ -257,27 +240,6 @@
         <div class="modal-footer">
             <div class="buttons">
                 <a href="javascript:hidePopup()" class="btn-operations">Ok</a>
-=======
-        <div class="content">
-            <div class="row">
-                <div class="col-lg-5 col-md-6 col-centered">
-                    <h2>
-                        <span class="fw-stack">
-                            <i class="fw fw-ring fw-stack-2x"></i>
-                            <i class="fw fw-error fw-stack-1x"></i>
-                        </span>
-                        Operation cannot be performed !
-                    </h2>
-                    <h4>
-                        Please select a user or a list of users to send invitation emails.
-                    </h4>
-                    <div class="buttons">
-                        <a href="javascript:hidePopup()" class="btn-operations">
-                            Ok
-                        </a>
-                    </div>
-                </div>
->>>>>>> bdb5b970fdf87856317a8e719487643d0cb823f5
             </div>
         </div>
     </div>
@@ -293,8 +255,6 @@
 
     <div id="reset-password-window" class="hide">
         <input type="hidden" id="user" value="{{user.username}}">
-<<<<<<< HEAD
-
         <div class="modal-header">
             <h3 class="pull-left modal-title">
                 <span class="fw-stack">
@@ -320,44 +280,6 @@
                 <br><br>
                 <div>
                     <input type="password" class="form-control modal-input operationDataKeys" id="confirmed-password" data-key="message"/>
-=======
-        <div class="content">
-            <div class="row">
-                <div class="col-lg-5 col-md-6 col-centered">
-                    <h2>
-                        <span class="fw-stack">
-                            <i class="fw fw-ring fw-stack-2x"></i>
-                            <i class="fw fw-key fw-stack-1x"></i>
-                        </span>
-                        Reset Password
-                    </h2>
-                    <br>
-                    <div id="notification-error-msg" class="alert alert-danger hidden" role="alert">
-                        <i class="icon fw fw-error"></i><span></span>
-                    </div>
-                    <h4>
-                        Enter new password
-                        <br><br>
-                        <!--suppress HtmlUnknownTag -->
-                        <!--suppress HtmlFormInputWithoutLabel -->
-                        <input type="password" class="form-control modal-input operationDataKeys" id="new-password" data-key="message"/>
-                        <br>
-                        Retype new password
-                        <br><br>
-                        <!--suppress HtmlFormInputWithoutLabel -->
-                        <input type="password" class="form-control modal-input operationDataKeys" id="confirmed-password" data-key="message"/>
-                        <br>
-                    </h4>
-                    <div class="buttons">
-                        <a href="#" id="reset-password-yes-link" class="btn-operations">
-                            &nbsp;&nbsp;&nbsp;&nbsp;Save&nbsp;&nbsp;&nbsp;&nbsp;
-                        </a>
-                        &nbsp;&nbsp;
-                        <a href="#" id="reset-password-cancel-link" class="btn-operations">
-                            &nbsp;&nbsp;&nbsp;&nbsp;Cancel&nbsp;&nbsp;&nbsp;&nbsp;
-                        </a>
-                    </div>
->>>>>>> bdb5b970fdf87856317a8e719487643d0cb823f5
                 </div>
                 <br>
             </h4>
@@ -400,4 +322,4 @@
     <script id="user-listing" data-current-user="{{currentUser.username}}"
             src="{{@page.publicUri}}/templates/listing.hbs" type="text/x-handlebars-template"></script>
     {{js "js/listing.js"}}
-{{/zone}}
\ No newline at end of file
+{{/zone}}