Correct disabled property on merge