Merge changes into local fork