Remove merge commit marker, add docblock