fixed merge and sound issues