Merging a fork to test if it works upstream