adhsahd
fixed merges innew js or session/music/users