add new styling
fix merge conflicts