#611 Changed date format in conflict