local change on file6.txt
local change in file4