Conflict fixes

- References innoraft/ir.love.revamp#157