added t1.txt by bc user
modify tt.txt by bc user
merge conflicts with home user