handle conflict
Merge branch 'master' of https://github.com/Renesau/brickcam