beacon fix android
merge fix