Merge branch 'release/0.6.6'
merge error
Merge branch 'master' into develop