File deleted in branch2
file changed in branchy
File added in branch 2.