salary structure done
resolved merge