I merged your new CONTRIBUTING.md file from your other pull request! So if you fetch upstream and merge the latest upstream/master into this branch, you'll get a conflict in this file. But simply resolve it in favor of master's version of the file, and all will be good.