diff --git a/radio/src/audio_arm.cpp b/radio/src/audio_arm.cpp
index b1229f1cc..678d173e0 100644
--- a/radio/src/audio_arm.cpp
+++ b/radio/src/audio_arm.cpp
@@ -145,7 +145,11 @@ char * getAudioPath(char * path)
 char * getSystemAudioPath(char * path)
 {
   char * str = getAudioPath(path);
+<<<<<<< HEAD
   strcpy(str, SYSTEM_SUBDIR "/");
+=======
+  strcpy(path, SYSTEM_SUBDIR "/");
+>>>>>>> 5f560e8d1b2815267f118be59c9269ed42357d66
   return str + sizeof(SYSTEM_SUBDIR);
 }