Merging into local fork