Editing of existing annotations (beta)
Fixed merge conflicts