merged sound branch