Corrected typo in tracking grid's fire_at method.
Fixed conflicts