Merging changes into fork