merging back in