Merge changes into own fork