I originally forked a repository from github and made many changes to it. In the meantime, the original repository changed and I wanted to merge the changes into my current
