Merge fork