updated some preferences
merge