https://github.com/imeji-community/imeji/issues/970
conflict fixed