fixed merge issues for annotations