NOJIRA: resolved merge conflicts