update conflicts on stylee.css

src/styles.scss

@@ -258,7 +258,7 @@ input.mat-input-element {
 .justfy-content-end {
   display: flex;
   justify-content: flex-end;
-
+}
 
 .owl-prev {
   position: absolute;