Changes in some files to generate conflicts
Resolving conflicts
Merge branch 'master' of https://github.com/darthega/wat-git-test