Resolved styling merge conflicts