QC
fixed conflicts