fixed git merge and google export for capture-meetings