modified hello.txt to conflict