Merger_octolin_kada

Another merger, but I think the reactor use went poorly on this one.

very sorry I uploade this incorrectly first time, so anyone quick off the mark may have caught a wrong merger. sorry.