test file changed in in 2 line 5
test file resilve conflict lines 4 5