nitr
merge conflict in package
resolved merge conflicts