Merging into fork