some preference changes
fixed conflicts
fixed merge