Dropped the FLAG public variable from NECA
fixed merged conflict in AndroidManifest