Test pull after external merge

Testing what happens in a pull request after I merge changes externally to GitHub