teste conflito
Merge branch 'master' of https://github.com/vlance/xpto

the commit.