fix mismerge of lcd_density