fix songs adding bug
fix conflicts