changed foo.txt
changed foo.txt conflit resolved