desktop styles
merge conflict, fix typo