resize images to be proportional
fix merge errors on home