chore: resolve merge conflict from master

src/components/form/fields/DateField.tsx

@@ -1,6 +1,6 @@
 import i18n from '@dhis2/d2-i18n'
 import { CalendarInput, CalendarInputProps } from '@dhis2/ui'
-import React, { useEffect, useState } from 'react'
+import React, { useState } from 'react'
 import { useField } from 'react-final-form'
 import { selectedLocale, useSystemSetting } from '../../../lib'