resolved merge errors in cal/sw stage