Diffraction and Low-x 2018