Merge fork with upstream