modified names.txt to get a remote merge conflict
conflict resolved on names.txt