Fixed the annotations menu right click.
Fixed merged conflict.