merging in r246