Fix track button
Fix merge conflict
Track button