remove merge error

Author: SteveMicroNova

CHANGELOG.md

@@ -4,8 +4,6 @@
 * System
   * Update our spotify provider `go-librespot` to `0.7.1`
   * Upgraded volume calculations to preserve relative positions when hitting the min or max setting via source volume bar
-
->>>>>>> bcaa2449 (Add vol_f_buffer functionality, imporving relativistic volume changes)
 * Web App
   * Changed caching rules to ensure that users don't get stuck with old versions of the webapp post update