diff --git a/tgui/packages/tgui/interfaces/Cargo.jsx b/tgui/packages/tgui/interfaces/Cargo.jsx
index 5f50d5b05d7..41bca94b68d 100644
--- a/tgui/packages/tgui/interfaces/Cargo.jsx
+++ b/tgui/packages/tgui/interfaces/Cargo.jsx
@@ -1,5 +1,8 @@
 import { filter, sortBy } from 'common/collections';
+<<<<<<< HEAD
 import { flow } from 'common/fp';
+=======
+>>>>>>> 0312a9f7d9a ([MIRROR] Fixes cargo import (#2061))
 
 import { useBackend, useSharedState } from '../backend';
 import {