fix merge conflict
Merge pull request #76 from Soundnode/develop

Add song duration