Merge local changes with upstream