diff --git a/selfdrive/test/process_replay/ref_commit b/selfdrive/test/process_replay/ref_commit
index 1d586b0334..21c1d460f0 100644
--- a/selfdrive/test/process_replay/ref_commit
+++ b/selfdrive/test/process_replay/ref_commit
@@ -1 +1,5 @@
+<<<<<<< HEAD
 05ba201bcf97b6c1067dbcde2a60f71f43469c56
+=======
+5ec442eb9d557ed7825953410cb1852e35af7df5
+>>>>>>> c5f413817 (update process replay ref commit)