Merging a PR from the main repo