Resolved merge conflict,Safety score logic works