NOJIRA merge hell