fixing Track My Stuff merge