Code

octopus: reenable fast-forward merges