Changed image sizes
Fixed merge