diff --git a/api/CONFIG.md b/api/CONFIG.md
index 65499301ad..1ab11682b7 100644
--- a/api/CONFIG.md
+++ b/api/CONFIG.md
@@ -168,6 +168,7 @@ Key | Default Value | Description
 :--- | :--- | :---
 cmd |  |  The command to execute to spawn the “back-end” process.
 icon |  |  The icon to use for identifying your app on Windows.
+logo |  |  The icon for the app package manifest
 pfx |  |  A relative path to the pfx file used for signing.
 
 # `window`
diff --git a/src/cli/cli.cc b/src/cli/cli.cc
index 1402667e2d..1532fbcf95 100644
--- a/src/cli/cli.cc
+++ b/src/cli/cli.cc
@@ -2619,7 +2619,11 @@ int main (const int argc, const char* argv[]) {
     String targetPlatform = optionsWithValue["--platform"];
 
     bool flagRunUserBuildOnly = optionsWithoutValue.find("--only-build") != optionsWithoutValue.end() || equal(rc["build_only"], "true");
+<<<<<<< HEAD
     bool flagCodeSign = optionsWithoutValue.find("--codesign") != optionsWithoutValue.end() || equal(rc["build_codesign"], "true");
+=======
+    bool flagCodeSign = optionsWithoutValue.find("-c") != optionsWithoutValue.end() || equal(rc["build_codesign"], "true");
+>>>>>>> 000036ff (fix(scr/cli/templates.hh): bring back win_logo)
     bool flagBuildHeadless = settings["build_headless"] == "true";
     bool flagRunHeadless = optionsWithoutValue.find("--headless") != optionsWithoutValue.end();
     bool flagShouldRun = optionsWithoutValue.find("--run") != optionsWithoutValue.end() || equal(rc["build_run"], "true");
diff --git a/src/cli/templates.hh b/src/cli/templates.hh
index f770c43f0f..6ab5426c02 100644
--- a/src/cli/templates.hh
+++ b/src/cli/templates.hh
@@ -519,7 +519,7 @@ constexpr auto gWindowsAppManifest = R"XML(<?xml version="1.0" encoding="utf-8"?
   <Properties>
     <DisplayName>{{meta_title}}</DisplayName>
     <Description>{{meta_description}}</Description>
-    <Logo>{{win_icon}}</Logo>
+    <Logo>{{win_logo}}</Logo>
     <PublisherDisplayName>{{meta_maintainer}}</PublisherDisplayName>
   </Properties>
 
@@ -545,12 +545,12 @@ constexpr auto gWindowsAppManifest = R"XML(<?xml version="1.0" encoding="utf-8"?
       Executable="{{win_exe}}"
     >
       <uap:VisualElements DisplayName="{{meta_title}}"
-        Square150x150Logo="{{win_icon}}"
-        Square44x44Logo="{{win_icon}}"
+        Square150x150Logo="{{win_logo}}"
+        Square44x44Logo="{{win_logo}}"
         Description="{{meta_description}}"
         BackgroundColor="#20123A"
       >
-        <uap:DefaultTile Wide310x150Logo="{{win_icon}}" />
+        <uap:DefaultTile Wide310x150Logo="{{win_logo}}" />
       </uap:VisualElements>
       <Extensions>
         <uap3:Extension
@@ -1845,8 +1845,11 @@ headers = native-module1.hh
 ; The icon to use for identifying your app on Windows.
 icon = "src/icon.png"
 
+; The icon for the app package manifest
+; logo = ""
+
 ; A relative path to the pfx file used for signing.
-pfx = "certs/cert.pfx"
+; pfx = "certs/cert.pfx"
 
 ; The signing information needed by the appx api.
 ; publisher = "CN=Beep Boop Corp., O=Beep Boop Corp., L=San Francisco, S=California, C=US"