date consistency
merge