diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c
index 9847cf9842..bef5cd1b39 100644
--- a/libavcodec/dcadec.c
+++ b/libavcodec/dcadec.c
@@ -2117,8 +2117,14 @@ static float dca_dmix_code(unsigned code)
 {
     int sign = (code >> 8) - 1;
     code &= 0xff;
+<<<<<<< HEAD
 #define POW2_MINUS15 .000030517578125
     return ((dca_dmixtable[code] ^ sign) - sign) * POW2_MINUS15;
+||||||| merged common ancestors
+    return ldexpf((dca_dmixtable[code] ^ sign) - sign, -15);
+=======
+    return ((dca_dmixtable[code] ^ sign) - sign) * (1.0 / (1U << 15));
+>>>>>>> f2ce63246f5c934429f9cb857a794e07624d7912
 }
 
 /**