added no sound
resolved merged conflicts