fixed SAS
fixed conflicts