Merge conkerorrcs