adding temp
Edited foo.txt
fixing conflict