Merge charges from upstream