add beacon tracking
Merge remote changes