diff --git a/recipes-support/aws-cli/aws-cli_1.45.19.bb b/recipes-support/aws-cli/aws-cli_1.45.19.bb
index 0fe50ea57d..965df6711a 100644
--- a/recipes-support/aws-cli/aws-cli_1.45.19.bb
+++ b/recipes-support/aws-cli/aws-cli_1.45.19.bb
@@ -9,7 +9,11 @@ SRC_URI = "\
     file://run-ptest \
 "
 
+<<<<<<<< HEAD:recipes-support/aws-cli/aws-cli_1.45.19.bb
 SRCREV = "0379c76c3d408a34f482298ace5dbc2a7f6d4b14"
+========
+SRCREV = "ab2238dc1180478afe188708570d11f4cf186c3a"
+>>>>>>>> dfed2fd59 (aws-cli: upgrade 1.45.38 -> 1.45.39):recipes-support/aws-cli/aws-cli_1.45.39.bb
 
 # version 2.x has got library link issues - so stick to version 1.x for now
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>1\.\d+(\.\d+)+)"
diff --git a/recipes-support/aws-cli/aws-cli_1.45.39.bb b/recipes-support/aws-cli/aws-cli_1.45.39.bb
new file mode 100644
index 0000000000..965df6711a
--- /dev/null
+++ b/recipes-support/aws-cli/aws-cli_1.45.39.bb
@@ -0,0 +1,55 @@
+SUMMARY = "Universal Command Line Interface for Amazon Web Services"
+DESCRIPTION = "Universal Command Line Interface for Amazon Web Services and ptest scripts"
+HOMEPAGE = "https://github.com/aws/aws-cli"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7970352423db76abb33cbe303884afbf"
+
+SRC_URI = "\
+    git://github.com/aws/aws-cli.git;protocol=https;branch=master \
+    file://run-ptest \
+"
+
+<<<<<<<< HEAD:recipes-support/aws-cli/aws-cli_1.45.19.bb
+SRCREV = "0379c76c3d408a34f482298ace5dbc2a7f6d4b14"
+========
+SRCREV = "ab2238dc1180478afe188708570d11f4cf186c3a"
+>>>>>>>> dfed2fd59 (aws-cli: upgrade 1.45.38 -> 1.45.39):recipes-support/aws-cli/aws-cli_1.45.39.bb
+
+# version 2.x has got library link issues - so stick to version 1.x for now
+UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>1\.\d+(\.\d+)+)"
+
+inherit setuptools3 ptest
+
+RDEPENDS:${PN} += "\
+    groff \
+    python3-botocore \
+    python3-colorama \
+    python3-dateutil \
+    python3-distro \
+    python3-docutils \
+    python3-jmespath \
+    python3-misc \
+    python3-prompt-toolkit \
+    python3-pyyaml \
+    python3-rsa \
+    python3-ruamel-yaml \
+    python3-s3transfer \
+    python3-sqlite3 \
+    python3-unixadmin \
+    python3-urllib3 \
+"
+
+RDEPENDS:${PN}-ptest += "\
+        ${PYTHON_PN}-pytest \
+        bash \
+"
+
+do_install_ptest() {
+        install -d ${D}${PTEST_PATH}/tests
+        # just install some tests with low memory (less than 4GB) consumption
+        cp -rf ${S}/tests/functional/test_args.py ${D}${PTEST_PATH}/tests/
+}
+
+PACKAGES =+ "${PN}-examples"
+
+FILES:${PN}-examples = "${libdir}/${PYTHON_DIR}/site-packages/awscli/examples"