Merging fork commits