add date column
fixing merge