resolve composer conflicts
add doc_annotated subscription event
add annotation notification