Fixed merge issue of prefs file