update SAS
fixed conflicts