desktop style
merge fix