Sorry, this is the failed merge link:
https://code.launchpad.net/~mhr3/unity-lens-music/rb-parse-tdb/+merge/101394
Sorry, this is the failed merge link:
https:/ /code.launchpad .net/~mhr3/ unity-lens- music/rb- parse-tdb/ +merge/ 101394