diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7b98630..5b35a6e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,15 +2,18 @@
 
 ## [Unreleased]
 
+<<<<<<< HEAD
 * Update Clink to 0.3.4
 * Fix powershell foreground color changingf to green
+=======
+* Update Clink Completions to 0.3.4
+* Fix powershell foreground color changing to green
+>>>>>>> 4575ac3209f7d513504bcaf80b41ef1106c9406a
 
 ## [1.3.12](https://github.com/cmderdev/cmder/tree/v1.3.11) (2019-08-18)
 
 ### Fixes
 
-* Pull Request: [#2122](https://github.com/cmderdev/cmder/pull/2122)
-  * Restore old `alias.cmd` without `create` syntax because it did not work in all situations.
 * Pull Request: [#2113](https://github.com/cmderdev/cmder/pull/2113)
   * Add `vendor\bin\vscode_init.cmd` for use with Visual Studio Code
   * Fixes [#2118](https://github.com/cmderdev/cmder/issues/2118)
diff --git a/launcher/src/CmderLauncher.cpp b/launcher/src/CmderLauncher.cpp
index de10d04..86ba8f3 100644
--- a/launcher/src/CmderLauncher.cpp
+++ b/launcher/src/CmderLauncher.cpp
@@ -633,6 +633,17 @@ cmderOptions GetOption()
 				cmderOptions.cmderConEmuArgs = szArgList[i + 1];
 				i++;
 			}
+			/* Bare double dash, remaining commandline is for conemu */
+			else if (_wcsicmp(L"--", szArgList[i]) == 0)
+			{
+				std::wstring cmdline = std::wstring(GetCommandLineW());
+				auto doubledash = cmdline.find(L" -- ");
+				if (doubledash != std::string::npos)
+				{
+					cmderOptions.cmderConEmuArgs = cmdline.substr(doubledash + 4);
+				}
+				break;
+			}
 			else if (cmderOptions.cmderStart == L"")
 			{
 				int len = wcslen(szArgList[i]);
diff --git a/vendor/init.bat b/vendor/init.bat
index 7855a7a..03dd18e 100644
--- a/vendor/init.bat
+++ b/vendor/init.bat
@@ -141,14 +141,14 @@ if "%CMDER_CLINK%" == "1" (
       copy "%CMDER_ROOT%\vendor\clink_settings.default" "%CMDER_USER_CONFIG%\settings"
       echo Additional *.lua files in "%CMDER_USER_CONFIG%" are loaded on startup.\
     )
-    "%CMDER_ROOT%\vendor\clink\clink_x%architecture%.exe" inject --quiet --profile "%CMDER_USER_CONFIG%" --scripts "%CMDER_ROOT%\vendor"
+    "%CMDER_ROOT%\vendor\clink\clink_x%architecture%.exe" inject --quiet --profile "%CMDER_USER_CONFIG%" --scripts "%CMDER_ROOT%\vendor" --nolog
   ) else (
     if not exist "%CMDER_ROOT%\config\settings" (
       echo Generating clink initial settings in "%CMDER_ROOT%\config\settings"
       copy "%CMDER_ROOT%\vendor\clink_settings.default" "%CMDER_ROOT%\config\settings"
       echo Additional *.lua files in "%CMDER_ROOT%\config" are loaded on startup.
     )
-    "%CMDER_ROOT%\vendor\clink\clink_x%architecture%.exe" inject --quiet --profile "%CMDER_ROOT%\config" --scripts "%CMDER_ROOT%\vendor"
+    "%CMDER_ROOT%\vendor\clink\clink_x%architecture%.exe" inject --quiet --profile "%CMDER_ROOT%\config" --scripts "%CMDER_ROOT%\vendor" --nolog
   )
 ) else (
   %lib_console% verbose_output "WARNING: Incompatible 'ComSpec/Shell' Detetected Skipping Clink Injection!"
diff --git a/vendor/sources.json b/vendor/sources.json
index bd864e7..8726e2e 100644
--- a/vendor/sources.json
+++ b/vendor/sources.json
@@ -1,8 +1,8 @@
 [
     {
         "name": "git-for-windows",
-        "version": "v2.21.0.windows.1",
-        "url": "https://github.com/git-for-windows/git/releases/download/v2.21.0.windows.1/PortableGit-2.21.0-64-bit.7z.exe"
+        "version": "v2.23.0.windows.1",
+        "url": "https://github.com/git-for-windows/git/releases/download/v2.23.0.windows.1/PortableGit-2.23.0-64-bit.7z.exe"
     },
     {
         "name": "clink",
@@ -11,8 +11,8 @@
     },
     {
         "name": "conemu-maximus5",
-        "version": "180626",
-        "url": "https://github.com/Maximus5/ConEmu/releases/download/v18.06.26/ConEmuPack.180626.7z"
+        "version": "190714",
+        "url": "https://github.com/Maximus5/ConEmu/releases/download/v19.07.14/ConEmuPack.190714.7z"
     },
     {
         "name": "clink-completions",