fixed bad merge in Dockerfile