merge from Pop-och-ljud fungerande tills vidare