Merge my patches with upstream