'Improving' date parsing
fixing merge conflicts