footer
fixed music.ejs merge conflicts