conflict fixed in FormDatetime.php