diff --git a/packages/app/src/components/context-window-meter.tsx b/packages/app/src/components/context-window-meter.tsx
index 4ea10a936b..8df68aa5ff 100644
--- a/packages/app/src/components/context-window-meter.tsx
+++ b/packages/app/src/components/context-window-meter.tsx
@@ -1,3 +1,7 @@
+<<<<<<< HEAD
+=======
+import { useCallback, useRef, useState } from "react";
+>>>>>>> ca504c7e6 (fix(app): deduplicate context meter refresh)
 import { Pressable, Text, View } from "react-native";
 import Svg, { Circle } from "react-native-svg";
 import { StyleSheet, useUnistyles } from "react-native-unistyles";