modified file6
modified file6 in branch1
modified file6
changed 'no one' to 'no human being' in file6
changed 'no one' to 'no human' in file6
fixed conflict in file6