changed date.txt
resolved conflict