diff --git a/lib/pangea/widgets/practice_activity/practice_activity_card.dart b/lib/pangea/widgets/practice_activity/practice_activity_card.dart
index f772bdfc8..ce888f0fb 100644
--- a/lib/pangea/widgets/practice_activity/practice_activity_card.dart
+++ b/lib/pangea/widgets/practice_activity/practice_activity_card.dart
@@ -50,7 +50,6 @@ class MessagePracticeActivityCardState extends State<PracticeActivityCard> {
     return langCode;
   }
 
-<<<<<<< Updated upstream
   void loadInitialData() {
     if (langCode == null) return;
     updatePracticeActivity();
@@ -76,11 +75,6 @@ class MessagePracticeActivityCardState extends State<PracticeActivityCard> {
     else if (activities.isNotEmpty) {
       practiceEvent = activities.last;
     }
-=======
-    practiceEvent =
-        widget.pangeaMessageEvent.practiceActivities(langCode).firstOrNull;
-
->>>>>>> Stashed changes
     setState(() {});
   }