new file on branch1
branches have been merged