Fix CONTRIBUTING.md conflict again

Author: synzen

CONTRIBUTING.md

@@ -23,9 +23,7 @@ If you use an outdated version of **npm**, then you may run into a [lock file co
 More info [here](https://github.com/npm/npm/issues/20434) and [here](https://github.com/npm/npm/issues/20891).
 
 [How do I know which version of **npm** comes with which version of **Node.js** ?](https://nodejs.org/en/download/releases/)
-=======
-=======
->>>>>>> dev
+
 # Contributing
 
 **The issue tracker is only for technical support, bug reports and enhancement suggestions.