merge fork with original