integrated generic date extractor
merge conflicts resolved