octopus: make merge process simpler to follow