Quickfix due that the Docker file has merge conflicts