preferences-management view post-merge fix