additional styling and formatting
resolve merge conflicts