Preparing the builder image.
Fixed conflict.