axis and labels
trying to limit merge conflicts
axes merge
reformatted graph