amend file2
amends file2
changed file2 again
changed testfile
changed testfile
merged testfile