remove conflict
Merge branch 'release/0.8.2.2'

* release/0.8.2.2:
  remove conflict
Merge tag '0.8.2.2' into develop

Fix

* tag '0.8.2.2':