merge conflict
adding song to bio