Update merge job to work with common-packer