updated testfile_ver1 in mid-11 for merge conflict test