Added some lyrics to Mars, no sound.
resolved merge conflict.