change fileone.txt master
solve fileone.txt merge conflict