Merging back from ch/open