Fixed merging, date format