Replaced commit conflicts within TrackingManager