Merge code from upstream while keeping main changes from fork