git merge
fix for: https://github.com/imeji-community/imeji/issues/846