fixed base image, bad merge issue