NOJIRA fix merge erro