added file3
merge conflict test
Merge branch 'oliver' of https://github.com/cyntzhou/branch-trial into oliver