not sure what changed
deleted merge bs
added set_title_and_music page
merge conflicts resolved