Musk's X, major labels end dispute over music on social-media platform