Using angularjs list track instead of a custom merge algorithm

Resolves #88