App styling
resolve conflict
filterz