fix: install @google/generative-ai and use writeFile for atomic writes in ConflictResolver

fix: install @google/generative-ai and use writeFile for atomic writes in ConflictResolver #20