three file deleted
test1 updated
conflict fixed