test conflict
Test
Merge branch 'master' of https://github.com/spthm/bc-ethz
Test
Merge branch 'master' of https://github.com/spthm/bc-ethz