do something
do something more
Merge pull request #2 from wesen/foo/test

NO GLOBAL CONFLICT