Manual merge with tbibb