merge error fixed
making the generic op_ASSIGN_w() function be used everywhere it is needed