remove width filter
fix merge conflict