preferences page stylin
merge conflicts