add sound support
fix conflict