add a otherfile to other branch
new line for other
merge both modify one file