fix gcm conflict