click to edit annotation
fixed merge