Resolve conflicts with John's sidebar CSS changes