need new sounds meow
fixed merge conflict