Fixed bug with HashMap in BroadcastActivity
fixed merge conflicts in BroadcastActivity