Sorry-- I always have to delete and restore files when I pull and it
causes conflict