diff --git a/datasources/src/main/resources/template/dataSourceManagement.html b/datasources/src/main/resources/template/dataSourceManagement.html
index 582107a9f..183fbfd11 100644
--- a/datasources/src/main/resources/template/dataSourceManagement.html
+++ b/datasources/src/main/resources/template/dataSourceManagement.html
@@ -6,8 +6,6 @@
   </head_merge>
   <main class="rudder-template" id="datasource" ng-controller="datasourceCtrl">
   </main>
-
-<<<<<<< HEAD
   <script>
     var hasWriteRights = false;
   </script>
@@ -24,361 +22,11 @@
         , hasWriteRights : hasWriteRights
       }
       var app = Elm.DataSources.init({ node: main, flags: initValues});
-=======
-      <div class="template-sidebar sidebar-left">
-        <div class="sidebar-header">
-          <div class="header-title">
-            <h1><span>Data sources</span></h1>
-            <div class="header-buttons">
-              <button type="button" class="btn btn-success" ng-click="createNewDatasource()">Create <i class="add-icon ion ion-android-add-circle"></i></button>
-            </div>
-          </div>
-        </div>
->>>>>>> branches/rudder/7.3
 
       app.ports.errorNotification.subscribe(function(str) {
         createErrorNotification(str)
       });
     })
   </script>
-
-<<<<<<< HEAD
-=======
-      </div>
-
-      <div class="template-main" ng-cloak>
-        <div class="main-container datasource-bloc" ng-if="selectedDatasource">
-          <div class="main-header">
-            <div class="header-title">
-              <h1>
-                <span ng-if="selectedDatasource.name.length>0">{{selectedDatasource.name}}</span>
-                <span ng-if="!selectedDatasource.name && selectedDatasource.isNew" style="opacity: 0.4;">New data source</span>
-                <span ng-if="!selectedDatasource.name && !selectedDatasource.isNew" style="font-style:italic; color:#777;">Unnamed</span>
-
-                <span class="badge-disabled" ng-if="!selectedDatasource.enabled"></span>
-              </h1>
-              <div class="header-buttons">
-                <div class="btn-group" role="group">
-                  <button type="button" class="btn btn-danger" ng-click="deleteDatasource()" ng-if="!selectedDatasource.isNew">Delete <i class="fa fa-times-circle"></i> </button>
-                </div>
-                <div class="btn-group" role="group">
-                  <button type="button" class="btn btn-default" ng-hide="selectedDatasource.isNew" ng-click="toggleEnabled()">{{selectedDatasource.enabled ? 'Disable' : 'Enable'}} <i class="fa" ng-class="{'fa-ban' : selectedDatasource.enabled, 'fa-circle-o' : !selectedDatasource.enabled}"></i></button>
-                </div>
-                <div class="btn-group pull-right" role="group">
-                  <lift:authz role="administration_write">
-                    <button type="button" class="btn btn-default" ng-click="selectDatasource(selectedDatasource.id)" ng-if="!selectedDatasource.isNew">Reset <i class="fa fa-rotate-left"></i></button>
-                    <button type="button" class="btn btn-default" ng-click="createNewDatasource()" ng-if="selectedDatasource.isNew">Reset <i class="fa fa-rotate-left"></i></button>
-                    <button type="button" class="btn btn-success" ng-click="saveDatasource()" ng-disabled="!forms.datasourceForm.$valid" >Save <i class="fa fa-download"></i></i></button>
-                  </lift:authz>
-                </div>
-              </div>
-            </div>
-            <div class="header-description" ng-if="selectedDatasource.description.length > 0">
-              <p>{{selectedDatasource.description}}</p>
-            </div>
-          </div>
-
-          <div class="main-navbar"><ul class="ui-tabs-nav "></ul></div>
-
-          <div class="main-details">
-            <form class="bloc-body show-details" name="forms.datasourceForm">
-              <div class="form-group">
-                <label for="name">Name</label>
-                <input type="text" class="form-control" id="name" ng-value="selectedDatasource.name" name="datasourceName" required ng-model="selectedDatasource.name" ng-change="updateKeyName(selectedDatasource.name)">
-                <span class="text-danger" ng-show="forms.datasourceForm.datasourceName.$error.required && forms.datasourceForm.datasourceName.$dirty">Name is required</span>
-              </div>
-              <div class="form-group">
-                <label for="key">Key name</label>
-                <div class="group-warning" ng-show="selectedDatasource.isNew"><span class="fa fa-info-circle"></span>Key name cannot be modified after creation.</div>
-                <input type="text" class="form-control has-example-help" id="key" name="datasourceKey" ng-value="selectedDatasource.id" required ng-model="selectedDatasource.id" ng-if="selectedDatasource.isNew" ng-change="updateKeyName(selectedDatasource.id)">
-                <input type="text" disabled class="form-control has-example-help" ng-if="!selectedDatasource.isNew" ng-value="selectedDatasource.id" ng-model="selectedDatasource.id"/>
-                <div class="example-help">
-                  The key name will be used to access imported data, such as <pre>${node.properties[{{selectedDatasource.id ? selectedDatasource.id : "key_name"}}]}</pre>
-                </div>
-                <span class="text-danger" ng-show="forms.datasourceForm.datasourceKey.$error.required && forms.datasourceForm.datasourceKey.$dirty">Key name is required</span>
-              </div>
-              <div class="form-group">
-                <label for="description" class="optional">Description</label>
-                <textarea class="form-control" id="description" ng-value="selectedDatasource.description" ng-model="selectedDatasource.description"></textarea>
-              </div>
-              <div class="form-group">
-                <label class="bloc">Type</label>
-                <div class="btn-group" data-toggle="buttons">
-                  <label class="btn btn-default active disabled">HTTP</label>
-                </div>
-              </div>
-              <div class="form-group">
-                <label class="bloc">Method</label>
-                <div class="btn-group">
-                  <label class="btn btn-default btn-radio" for="get" ng-class="{'active':selectedDatasource.type.parameters.requestMethod=='GET'}">
-                    <input type="radio" id="get" ng-model="selectedDatasource.type.parameters.requestMethod" value="GET"> GET
-                  </label>
-                  <label class="btn btn-default btn-radio" for="post" ng-class="{'active':selectedDatasource.type.parameters.requestMethod=='POST'}">
-                    <input type="radio" id="post" ng-model="selectedDatasource.type.parameters.requestMethod" value="POST"> POST
-                  </label>
-                </div>
-              </div>
-              <div class="form-group" ng-show="selectedDatasource.type.parameters.requestMethod=='POST'">
-                <label><a ng-click="toggleWell($event)">Parameters<span class="fa fa-chevron-right"></span></a></label>
-                <div class="well" style="display:none">
-                  <div class="group-warning" ng-hide="selectedDatasource.type.parameters.params.length>0"><span class="fa fa-info-circle"></span>No parameters defined for this data source.</div>
-                  <div class="input-group group-header" ng-repeat="param in selectedDatasource.type.parameters.params track by $index">
-                    <input type="text" class="form-control" ng-model="param.name">
-                    <span class="input-group-addon">:</span>
-                    <input type="text" class="form-control" ng-model="param.value">
-                    <span class="input-group-btn">
-                      <button class="btn btn-danger" type="button" ng-click="removeObj(selectedDatasource.type.parameters.params, $index)"><span class="fa fa-minus"></span></button>
-                    </span>
-                  </div>
-                  <div class="new-headers">
-                    <div class="bs-callout bs-callout-info text-info">Don't forget to click on the green plus to add the new parameter!</div>
-                    <div class="input-group group-header">
-                      <input type="text" class="form-control " ng-value="selectedDatasource.newParam.name" ng-model="selectedDatasource.newParam.name" placeholder="name">
-                      <span class="input-group-addon">:</span>
-                      <input type="text" class="form-control " ng-value="selectedDatasource.newParam.value" ng-model="selectedDatasource.newParam.value" placeholder="value">
-                      <span class="input-group-btn">
-                        <button class="btn btn-success " type="button" ng-click="addNewObj(selectedDatasource.type.parameters.params,selectedDatasource.newParam)"><span class="fa fa-plus"></span></button>
-                      </span>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div class="form-group clearfix">
-                <label for="url">URL</label>
-                <input type="text" class="form-control has-example-help" id="url" ng-value="selectedDatasource.type.parameters.url" ng-model="selectedDatasource.type.parameters.url">
-                <div class="example-help">
-                  You can use Rudder variable expansion (<pre>${rudder.node.xxx}, ${rudder.param.xxx}, ${node.properties[xxx]}</pre>) here. They will be replaced by their values for each node at the time the HTTP query is run.
-                </div>
-              </div>
-              <div class="form-group">
-                <label class="optional-link"><a ng-click="toggleHeaders('headers',$event);"><b>Headers</b><span class="fa fa-chevron-right"></span></a></label>
-                <div id="headers" class="well" style="display:none;">
-                  <div class="group-warning" ng-hide="selectedDatasource.type.parameters.headers.length>0"><span class="fa fa-info-circle"></span>No headers defined for this data source.</div>
-                  <div class="input-group group-header" ng-repeat="header in selectedDatasource.type.parameters.headers track by $index">
-                    <input type="text" class="form-control" ng-model="header.name">
-                    <span class="input-group-addon">:</span>
-                    <input type="text" class="form-control" ng-model="header.value">
-                    <span class="input-group-btn">
-                      <button class="btn btn-danger" type="button" ng-click="removeObj(selectedDatasource.type.parameters.headers, $index)"><span class="fa fa-minus"></span></button>
-                    </span>
-                  </div>
-                  <div id="new-headers" class="new-headers">
-                    <div class="bs-callout bs-callout-info text-info">Don't forget to click on the green plus to add the new header!</div>
-                    <div class="input-group group-header">
-                      <input type="text" class="form-control" id="new-header" ng-value="selectedDatasource.newHeader.name" ng-model="selectedDatasource.newHeader.name" placeholder="name">
-                      <span class="input-group-addon">:</span>
-                      <input type="text" class="form-control" ng-value="selectedDatasource.newHeader.value" ng-model="selectedDatasource.newHeader.value" placeholder="value">
-                      <span class="input-group-btn">
-                        <button class="btn btn-success" type="button" ng-click="addNewObj(selectedDatasource.type.parameters.headers,selectedDatasource.newHeader)"><span class="fa fa-plus"></span></button>
-                      </span>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div class="form-group clearfix">
-                <label for="jsonpath" class="optional">
-                  JSON path
-                  <span class="fa fa-question-circle icon-info" ng-mouseover="toggleInfo($event, 'show')" ng-mouseout="toggleInfo($event, 'hide')" data-toggle="popover" data-placement="right" data-content="You can also use Rudder variable expansion here. See help for URL above."></span>
-                </label>
-                <div class="input-group">
-                  <label class="input-group-addon addon has-example-help" for="jsonpath">$.</label>
-                  <input type="text" class="form-control has-example-help" id="jsonpath" ng-value="selectedDatasource.type.parameters.path" ng-model="selectedDatasource.type.parameters.path">
-                </div>
-                <div class="example-help">
-                  When a JSON document is returned, you can define a JSON path expression (see <a href="https://github.com/jayway/JsonPath/#getting-started" target="_blank">documentation</a>) to select only a sub-part of the document as the actual data to use as a node property.
-                </div>
-              </div>
-              <div class="form-group">
-                <label><a ng-click="toggleWell($event)">Advanced options <span class="fa fa-chevron-right"></span></a></label>
-                <div class="well options" style="display:none">
-                  <ul class="form-group ">
-                    <li class="rudder-form">
-                      <div class="input-group">
-                        <label class="input-group-addon" for="checkSsl">
-                          <input type="checkbox" id="checkSsl" ng-model="selectedDatasource.type.parameters.checkSsl" ng-true-value="false" ng-false-value="true"/>
-                          <label for="checkSsl" class="label-radio">
-                            <span class="ion ion-checkmark-round"></span>
-                          </label>
-                          <span class="ion ion-checkmark-round check-icon"></span>
-                        </label>
-                        <label class="form-control" for="checkSsl">
-                          Ignore SSL certificate validation
-                        </label>
-                      </div>
-                    </li>
-                  </ul>
-                  <label>HTTP request timeout</label>
-                  <div class="input-group group-update-frequency">
-                    <input type="number" class="form-control " id="requesttimeout-minutes" ng-min="0" ng-model="selectedDatasource.modifiedTimes.requestTimeout.minute">
-                    <label for="requesttimeout-minutes" class="input-group-addon">minute<span ng-class="{'invisible' : selectedDatasource.modifiedTimes.requestTimeout.minute<2}">s</span></label>
-                    <input type="number" class="form-control " id="requesttimeout-seconds" ng-min="0" ng-model="selectedDatasource.modifiedTimes.requestTimeout.second">
-                    <label for="requesttimeout-seconds" class="input-group-addon">second<span ng-class="{'invisible' : selectedDatasource.modifiedTimes.requestTimeout.second<2}">s</span></label>
-                  </div>
-                  <label>Data source update max duration</label>
-                  <div class="input-group group-update-frequency">
-                    <input type="number" class="form-control " id="updatetimeout-minutes" ng-min="0" ng-model="selectedDatasource.modifiedTimes.updateTimeout.minute">
-                    <label for="updatetimeout-minutes" class="input-group-addon">minute<span ng-class="{'invisible' : selectedDatasource.modifiedTimes.updateTimeout.minute<2}">s</span></label>
-                    <input type="number" class="form-control " id="updatetimeout-seconds" ng-min="0" ng-model="selectedDatasource.modifiedTimes.updateTimeout.second">
-                    <label for="updatetimeout-seconds" class="input-group-addon">second<span ng-class="{'invisible' : selectedDatasource.modifiedTimes.updateTimeout.second<2}">s</span></label>
-                  </div>
-                  <label>Maximum number of parallel requests</label>
-                  <div class="input-group group-update-frequency">
-                    <input type="number" class="form-control " id="maxParallelReq" ng-min="0" ng-model="selectedDatasource.type.parameters.maxParallelReq">
-                  </div>
-                </div>
-              </div>
-              <div class="form-group">
-                <label class="bloc"><a ng-click="toggleWell($event)">Update triggers<span class="fa fa-chevron-right"></span></a></label>
-                <div class="well" style="display:none">
-                  <ul class="form-group ">
-                    <li class="rudder-form">
-                      <div class="input-group">
-                        <label class="input-group-addon" for="neverUpdate">
-                          <input type="checkbox" id="neverUpdate" ng-model="selectedDatasource.runParameters.schedule.type" ng-true-value="'scheduled'" ng-false-value="'notscheduled'">
-                          <label for="neverUpdate" class="label-radio">
-                            <span class="ion ion-checkmark-round"></span>
-                          </label>
-                          <span class="ion ion-checkmark-round check-icon"></span>
-                        </label>
-                        <label class="form-control" for="neverUpdate">
-                          Update periodically - {{selectedDatasource.runParameters.schedule.type}}
-                        </label>
-                      </div>
-                    </li>
-                  </ul>
-                  <div class="input-group group-update-frequency" ng-hide="selectedDatasource.runParameters.schedule.type=='notscheduled'">
-                    <input type="number" class="form-control " id="updateFrequency-hours" ng-min="0" ng-model="selectedDatasource.modifiedTimes.schedule.hour">
-                    <label for="updateFrequency-hours" class="input-group-addon">hour<span ng-class="{'invisible' : selectedDatasource.modifiedTimes.schedule.hour<2}">s</span></label>
-                    <input type="number" class="form-control " id="updateFrequency-minutes" ng-min="0" ng-model="selectedDatasource.modifiedTimes.schedule.minute">
-                    <label for="updateFrequency-minutes" class="input-group-addon">minute<span ng-class="{'invisible' : selectedDatasource.modifiedTimes.schedule.minute<2}">s</span></label>
-                  </div>
-                  <ul class="form-group ">
-                    <li class="rudder-form">
-                      <div class="input-group">
-                        <label class="input-group-addon" for="onGeneration">
-                          <input type="checkbox" id="onGeneration" ng-model="selectedDatasource.runParameters.onGeneration" ng-checked="selectedDatasource.runParameters.onGeneration">
-                          <label for="onGeneration" class="label-radio">
-                            <span class="ion ion-checkmark-round"></span>
-                          </label>
-                          <span class="ion ion-checkmark-round check-icon"></span>
-                        </label>
-                        <label class="form-control" for="onGeneration">
-                          Update when a policy generation starts
-                        </label>
-                      </div>
-                    </li>
-                    <li class="rudder-form">
-                      <div class="input-group">
-                        <label class="input-group-addon" for="onNewNode">
-                          <input type="checkbox" id="onNewNode" ng-model="selectedDatasource.runParameters.onNewNode" ng-checked="selectedDatasource.runParameters.onNewNode">
-                          <label for="onNewNode" class="label-radio">
-                            <span class="ion ion-checkmark-round"></span>
-                          </label>
-                          <span class="ion ion-checkmark-round check-icon"></span>
-                        </label>
-                        <label class="form-control" for="onNewNode">
-                          Update when a new node is accepted
-                        </label>
-                      </div>
-                    </li>
-                  </ul>
-                </div>
-              </div>
-              <div class="form-group">
-                <label class="bloc"><a ng-click="toggleWell($event)">What to do when a query for a Node returns a 404 error?<span class="fa fa-chevron-right"></span></a></label>
-                <div class="well" style="display:none">
-                  <ul class="form-group ">
-                    <li class="rudder-form">
-                      <div class="input-group">
-                        <label class="input-group-addon" for="onMissingDelete">
-                          <input type="radio" id="onMissingDelete" ng-model="selectedDatasource.type.parameters.onMissing.name" value="delete">
-                          <label for="onMissingDelete" class="label-radio">
-                            <span class="ion ion-checkmark-round"></span>
-                          </label>
-                          <span class="ion ion-checkmark-round check-icon"></span>
-                        </label>
-                        <label class="form-control" for="onMissingDelete">
-                          Delete the node property corresponding to that data source (default behavior)
-                        </label>
-                      </div>
-                    </li>
-                  </ul>
-                  <ul class="form-group ">
-                    <li class="rudder-form">
-                      <div class="input-group">
-                        <label class="input-group-addon" for="onMissingNoChange">
-                          <input type="radio" id="onMissingNoChange" ng-model="selectedDatasource.type.parameters.onMissing.name" value="noChange">
-                          <label for="onMissingNoChange" class="label-radio">
-                            <span class="ion ion-checkmark-round"></span>
-                          </label>
-                          <span class="ion ion-checkmark-round check-icon"></span>
-                        </label>
-                        <label class="form-control" for="onMissingNoChange">
-                          Do not change the node property corresponding to that data source
-                        </label>
-                      </div>
-                    </li>
-                    <li class="rudder-form">
-                      <div class="input-group">
-                        <label class="input-group-addon" for="onMissingDefaultValue">
-                          <input type="radio" id="onMissingDefaultValue" ng-model="selectedDatasource.type.parameters.onMissing.name" value="defaultValue">
-                          <label for="onMissingDefaultValue" class="label-radio">
-                            <span class="ion ion-checkmark-round"></span>
-                          </label>
-                          <span class="ion ion-checkmark-round check-icon"></span>
-                        </label>
-                        <label class="form-control" for="onMissingDefaultValue">
-                          Set the node property corresponding to the data source to the following value:
-                        </label>
-                        <div class="input-group group-onmissing-value" ng-hide="selectedDatasource.type.parameters.onMissing.name!='defaultValue'">
-                          <label for="onMissingDefaultValueValue" class="form-control">(string or JSON allowed, empty is equivalent to deleting the property)</label>
-                          <textarea class="form-control " id="onMissingDefaultValueValue" ng-model="selectedDatasource.type.parameters.onMissing.value"></textarea>
-                        </div>
-                      </div>
-                    </li>
-                  </ul>
-                </div>
-              </div>
-            </form>
-          </div>
-        </div>
-
-        <div class="jumbotron jumbotron-datasource" ng-if="!selectedDatasource">
-          <h1>Node properties data sources</h1>
-          <p>
-            Nodes have properties that can be used to create groups or in techniques and directives parameters.
-            These properties are <b>key/value</b> pairs, where values can be a simple string or a well formed JSON document.
-          </p>
-          <p>
-            You can automatically import node properties by creating data sources that will query a third party REST API to retrieve data and it in a given property key for each node it's available for.
-          </p>
-          <p><button class="btn btn-success btn-lg" type="button" ng-click="createNewDatasource()">Create <i class="add-icon ion ion-android-add-circle"></i></button></p>
-        </div>
-
-      </div>
-
-
-    <div class="modal fade datasource-modal" id="deleteModal" tabindex="-1" role="dialog">
-      <div class="modal-dialog" role="document">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-            <h4 class="modal-title">Delete {{selectedDatasource.name}}</h4>
-          </div>
-          <div class="modal-body">
-            <h4 class="text-center">Are your sure you want to delete this datasource ?</h4>
-          </div>
-          <div class="modal-footer">
-            <lift:authz role="administration_write">
-              <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              <button type="button" class="btn btn-danger" ng-click="confirmDeleteDatasource()">Delete</button>
-            <lift:authz role="administration_write">
-          </div>
-        </div>
-      </div>
-    </div>
-
-  </div>
->>>>>>> branches/rudder/7.3
 </lift:surround>