ruby: fix merge errors