build local1.txt
local1.txt add line2
local1.txt add line3
local 4
add local 5
modify ++3
solve conflit