Resolve CSS conflicts

Signed-off-by: Rémy Coutable <remy@rymai.me>

app/assets/stylesheets/framework/avatar.scss

@@ -59,13 +59,10 @@
   &.avatar-tile {
     border-radius: 0;
     border: 0;
-<<<<<<< HEAD
   }
 
   &.avatar-placeholder {
     border: 0;
-=======
->>>>>>> upstream/master
   }
 
   &:not([href]):hover {

app/assets/stylesheets/framework/modal.scss

@@ -48,7 +48,3 @@ body.modal-open {
 .modal.popup-dialog {
   display: block;
 }
-<<<<<<< HEAD
-=======
-
->>>>>>> upstream/master

app/assets/stylesheets/pages/note_form.scss

@@ -111,15 +111,11 @@
   margin: auto;
   align-items: center;
 
-<<<<<<< HEAD
-  .md-area {
-=======
   .icon {
     margin-right: $issuable-warning-icon-margin;
   }
 
   + .md-area {
->>>>>>> upstream/master
     border-top-left-radius: 0;
     border-top-right-radius: 0;
   }