Massive refactoring in tracking links
Resolve merge conflicts