chore: resolved conflicts

lms/public/css/style.css

@@ -415,11 +415,13 @@ input[type=checkbox] {
 }
 
 .course-card-footer {
-  margin-top: auto;
+	display: flex;
+	justify-content: space-between;
+	margin-top: auto;
 }
 
-.course-card-footer .avatar-group {
-  display: inherit;
+.course-price {
+	font-weight: 500;
 }
 
 .view-course-link {
@@ -552,6 +554,11 @@ input[type=checkbox] {
   }
 }
 
+.course-card-instructors {
+	display: flex;
+	align-items: center;
+}
+
 .course-card-wide-content {
   display: flex;
   flex-direction: column;
@@ -2285,6 +2292,13 @@ select {
 	left: 0;
 }
 
-.course-filter {
+.form-section .section-head {
+	margin-bottom: var(--margin-sm);
+	font-weight: 700;
+	color: var(--heading-color);
+}
+
+.form-column:first-child {
+	padding-right: 1rem !important;
+}
 
-}