modified hello.txt
added hellogoodbye.txt
conflict resolved