updated testfile_ver1 in mid-12 for merge conflict test