Few grmmr n sentnc updates
Resolved merge conflicts