ConflictDialog.tsxozanatgreenpt/thirdTimer/src/frontend/components/ConflictDialog.tsx