added my change to foo.txt
resolved foo.txt conflict