fix annotation conflict