ddev-vite: Conflict resolved