Fixed merge annotations bug