Fix merge.

lib/pages/class_feedback/service/feedback_provider.dart

@@ -1,3 +1,4 @@
+import 'package:acs_upb_mobile/pages/classes/model/class.dart';
 import 'package:cloud_firestore/cloud_firestore.dart';
 import 'package:flutter/cupertino.dart';
 
@@ -11,7 +12,6 @@ import '../model/questions/question_dropdown.dart';
 import '../model/questions/question_rating.dart';
 import '../model/questions/question_slider.dart';
 import '../model/questions/question_text.dart';
-import 'package:acs_upb_mobile/pages/classes/model/class.dart';
 
 extension ClassFeedbackAnswerExtension on FeedbackAnswer {
   Map<String, dynamic> toData() {
@@ -204,7 +204,7 @@ class FeedbackProvider with ChangeNotifier {
 
   Future<Map<String, bool>> getClassesWithCompletedFeedback(String uid) async {
     try {
-      final DocumentSnapshot snap =
+      final DocumentSnapshot<Map<String, dynamic>> snap =
           await FirebaseFirestore.instance.collection('users').doc(uid).get();
       if (snap.data()['classesFeedback'] != null) {
         return Map<String, bool>.from(snap.data()['classesFeedback']);

lib/pages/home/home_page.dart

@@ -1,9 +1,9 @@
+import 'package:acs_upb_mobile/pages/home/feedback_nudge.dart';
+import 'package:acs_upb_mobile/resources/remote_config.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 
-import 'package:acs_upb_mobile/pages/home/feedback_nudge.dart';
-import 'package:acs_upb_mobile/resources/remote_config.dart';
 import '../../authentication/service/auth_provider.dart';
 import '../../generated/l10n.dart';
 import '../../navigation/routes.dart';