changes to definition of hastracking
fixed conflicts