failed test, with
commited in master
Merge branch 'master' of github.com:fpalomo/test-conflicts-github into test