Update changelog

CHANGELOG.md

@@ -1,4 +1,15 @@
-<<<<<<< HEAD
+### [2.0.12] 2021-04-01
+
+  * Fixed support for new GitHub OAuth token format (#9757)
+  * Fixed support for Vagrant/VirtualBox filesystem slowness by adding short sleeps in some places (#9627) 
+  * Fixed unclear error reporting when a package is in the lock file but not in the remote repositories (#9750)
+  * Fixed processes silently ignoring the CWD when it does not exist
+  * Fixed new Windows bin handling to avoid proxying phar files (#9742)
+  * Fixed issue extracting archives into paths that already exist, fixing problems with some custom installers (composer/installers#479)
+  * Fixed support for branch names starting with master/trunk/default (#9739)
+  * Fixed self-update to preserve phar file permissions on Windows (#9733)
+  * Fixed git execution failures to also include the stdout output (#9720)
+
 ### [2.0.11] 2021-02-24
 
   * Reverted "Fixed runtime autoloader registration (for plugins and script handlers) to prefer the project dependencies over the bundled Composer ones" as it caused more problems than expected
@@ -183,12 +194,11 @@
   * Fixed package ordering when autoloading and especially when loading plugins, to make sure dependencies are loaded before their dependents
   * Fixed suggest output being very spammy, it now is only one line long and shows more rarely
   * Fixed conflict rules like e.g. >=5 from matching dev-master, as it is not normalized to 9999999-dev internally anymore
-=======
+
 ### [1.10.21] 2021-04-01
 
   * Fixed support for new GitHub OAuth token format
   * Fixed processes silently ignoring the CWD when it does not exist
->>>>>>> 1.10
 
 ### [1.10.20] 2021-01-27
 
@@ -1121,6 +1131,7 @@
 
   * Initial release
 
+[2.0.12]: https://github.com/composer/composer/compare/2.0.11...2.0.12
 [2.0.11]: https://github.com/composer/composer/compare/2.0.10...2.0.11
 [2.0.10]: https://github.com/composer/composer/compare/2.0.9...2.0.10
 [2.0.9]: https://github.com/composer/composer/compare/2.0.8...2.0.9