https://github.com/imeji-community/imeji/issues/845
commit to sync
https://github.com/imeji-community/imeji/issues/840
fix conflict