diff --git a/ng2-components/ng2-alfresco-search/src/components/alfresco-search-autocomplete.component.html b/ng2-components/ng2-alfresco-search/src/components/alfresco-search-autocomplete.component.html
index 70f02269e0..868ca1dcf2 100644
--- a/ng2-components/ng2-alfresco-search/src/components/alfresco-search-autocomplete.component.html
+++ b/ng2-components/ng2-alfresco-search/src/components/alfresco-search-autocomplete.component.html
@@ -1,7 +1,7 @@
-<table *ngIf="results && results.length && searchTerm" class="mdl-data-table mdl-js-data-table mdl-shadow--2dp full-width">
+<table data-automation-id="autocomplete_results" *ngIf="results && results.length && searchTerm" class="mdl-data-table mdl-js-data-table mdl-shadow--2dp full-width">
     <tbody>
     <tr *ngFor="let result of results; let idx = index">
-        <td><a data-automation-id="autocomplete_res_for_{{result.entry.name}}" href="#" (click)="onItemClick(result, $event)">{{result.entry.name}}</a></td>
+        <td><a attr.data-automation-id="autocomplete_result_for_{{result.entry.name}}" href="#" (click)="onItemClick(result, $event)">{{result.entry.name}}</a></td>
     </tr>
     </tbody>
 </table>
diff --git a/ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.html b/ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.html
index be301e7f0b..bb4f039fd7 100644
--- a/ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.html
+++ b/ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.html
@@ -4,14 +4,9 @@
             <i class="material-icons">search</i>
         </label>
         <div [class]="getTextFieldHolderClassName()">
-<<<<<<< HEAD
-            <input class="mdl-textfield__input" [type]="inputType" [autocomplete]="getAutoComplete()"
+            <input class="mdl-textfield__input" [type]="inputType" [autocomplete]="getAutoComplete()" data-automation-id="search_input"
                    id="searchControl" [ngFormControl]="searchControl" [(ngModel)]="searchTerm" (focus)="onFocus($event)" (blur)="onBlur($event)">
             <label class="mdl-textfield__label" for="searchControl">{{'SEARCH.CONTROL.LABEL' | translate}}</label>
-=======
->>>>>>> 2404034e7887fb5bd192f1c08bfde703aca4a7b6
-            <input class="mdl-textfield__input" [type]="inputType" [autocomplete]="getAutoComplete()" id="searchTerm" data-automation-id="search_input" [ngFormControl]="searchControl" [(ngModel)]="searchTerm">
-            <label class="mdl-textfield__label" for="searchTerm">{{'SEARCH.CONTROL.LABEL' | translate}}</label>
         </div>
     </div>
 </form>
diff --git a/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.html b/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.html
index 56853f9b83..cb719c4938 100644
--- a/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.html
+++ b/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.html
@@ -1,10 +1,6 @@
 <p data-automation-id="search_result_found" *ngIf="results && results.length">{{ 'SEARCH.RESULTS.SUMMARY' | translate:{numResults: results.length, searchTerm: searchTerm} }}</p>
-<p data-automation-id="search_result_found" *ngIf="results&& results.length == 0">{{ 'SEARCH.RESULTS.NONE' | translate:{searchTerm: searchTerm} }}</p>
-<<<<<<< HEAD
+<p data-automation-id="search_no_result_found" *ngIf="results&& results.length == 0">{{ 'SEARCH.RESULTS.NONE' | translate:{searchTerm: searchTerm} }}</p>
 <table data-automation-id="search_result_table" *ngIf="results && results.length && searchTerm" class="mdl-data-table mdl-js-data-table mdl-shadow--2dp full-width">
-=======
-<table *ngIf="results && results.length && searchTerm" class="mdl-data-table mdl-js-data-table mdl-shadow--2dp full-width">
->>>>>>> 2404034e7887fb5bd192f1c08bfde703aca4a7b6
     <thead>
     <tr>
         <th>
@@ -22,13 +18,12 @@
     </tr>
     </thead>
     <tbody>
-
-    <tr *ngFor="let result of results; let idx = index">PIPPO
+    <tr *ngFor="let result of results; let idx = index" >
         <td><img src="{{getDocumentThumbnailUrl(result)}}" /></td>
-        <td data-automation-id="file_{{result.entry.name}}">{{result.entry.name}}</td>
-        <td data-automation-id="file_{{result.entry.name}}_{{result.entry.modifiedByUser.displayName}}">{{result.entry.modifiedByUser.displayName}}</td>
+        <td attr.data-automation-id=file_{{result.entry.name}}>{{result.entry.name}}</td>
+        <td attr.data-automation-id=file_{{result.entry.name}}_{{result.entry.modifiedByUser.displayName}}>{{result.entry.modifiedByUser.displayName}}</td>
         <td>{{result.entry.modifiedAt}}</td>
-    </tr>SUCA
+    </tr>
 
     </tbody>
 </table>