git status
Added missing files for the import from Google Task feature
Fixed merge issues