added watch for ap-n ang gcm
merge fix