fixed beacon_in logic check
fixed merge