font size and headers
resolve merge