Remove margins
Reduce widths
Merge conflict