Fixed tracking
Merging Issues Fixed