Merging with fork