diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-questions/dynamic-docs-form/dynamic-docs-form.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-questions/dynamic-docs-form/dynamic-docs-form.component.html
index 2d5246c..d3e31bc 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-questions/dynamic-docs-form/dynamic-docs-form.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-questions/dynamic-docs-form/dynamic-docs-form.component.html
@@ -20,12 +20,8 @@
         <div fxFlex="40" align="center" fxLayoutAlign="center center">
                   <div *ngIf="item.controls['img'] && item.value.img != ''">
                       <img [src]="item.value.img" ngxViewer style="width:85px; height: 85px;float:right">
-<<<<<<< HEAD
-                    </div><br>
-=======
                     </div>
                     <span (click)="capture($event,i,item)">
->>>>>>> 76b66f0681e274e77b54115baf2b71c241b35a58
                     <app-capture-btn addMoreBtn="true" *ngIf="camera_btn[i] == true" class="file-btn"  (imageDataEmitter)="capture($event,i,item)"></app-capture-btn>
                     </span>
                     <!-- <div style="width: 100%"> -->