merge my changes with upstream changes