Solved merge conflict in annot_grammar

Signed-off-by: Larissa Bentes <lgpbentes@gmail.com>