fixed conflicts for autobrightness merge
merged conflicts on autobrightness
fixed merging conflicts on autobrightness adjustment