Display cart courses part2

src/app/degree-planner/term-container/term-container.component.html

@@ -9,18 +9,17 @@
       <div fxLayout="row" fxLayoutAlign="space-between center">
         <p class="text-right semi-bold credits">{{ credits$ | async }} Cr</p>
         <ng-container *ngIf="(note$ | async) as note; else newNote">
-          <button mat-icon-button [disabled]="note.isLoaded === false" (click)="openNotesDialog(note)">
+          <button
+            mat-icon-button
+            [disabled]="note.isLoaded === false"
+            (click)="openNotesDialog(note)"
+          >
             <mat-icon
               aria-label="Open dialog with notes in this term"
               color="primary"
               matTooltip="Edit Note"
-<<<<<<< HEAD
-              matTooltipPosition="above">
-=======
-              (click)="openNotesDialog(note)"
               matTooltipPosition="above"
             >
->>>>>>> Display cart courses
               insert_drive_file
             </mat-icon>
           </button>
@@ -31,21 +30,12 @@
               aria-label="Open dialog with notes in this term"
               color="primary"
               matTooltip="Add Note"
-<<<<<<< HEAD
-              matTooltipPosition="above">
-              note_add
-            </mat-icon>
-          </button>
-        </ng-template>
-=======
-              (click)="openNotesDialog()"
               matTooltipPosition="above"
             >
               note_add
             </mat-icon>
-          </ng-template>
-        </button>
->>>>>>> Display cart courses
+          </button>
+        </ng-template>
       </div>
     </div>
     <div
@@ -57,7 +47,7 @@
       (cdkDropListDropped)="drop($event)"
     >
       <!-- Render term note (if it exists) -->
-      <ng-container *ngIf="note$ | async as note">
+      <ng-container *ngIf="(note$ | async) as note">
         <ng-container *ngIf="note.isLoaded; else noteIsLoading">
           <div class="note-item" (click)="openNotesDialog(note)">
             <p class="semi-bold">Note</p>
@@ -68,7 +58,10 @@
           <div class="note-item note-item-loading">
             <p class="semi-bold">Note</p>
             <p class="note-excerpt">{{ note.text }}</p>
-            <mat-progress-spinner mode="indeterminate" diameter="24"></mat-progress-spinner>
+            <mat-progress-spinner
+              mode="indeterminate"
+              diameter="24"
+            ></mat-progress-spinner>
           </div>
         </ng-template>
       </ng-container>