fixed merge error
added lyrics to the output - need to fix the timings though, they seem off