Merge with fork