Add repeat track functionality
Resolve conflict