Update file2.txt

chgs ion br1
chgs br2
merged conflict
commit kk change br1