wavpack: resolve conflicts