Merging updates into fork