sync upstream changes