Make Octopus merge message a bit nicer.