merge conflicts resolved styling missing: