merge desktop styles under media queries