NOJIRA Fix merge