diff --git a/.changelog/23879.txt b/.changelog/23879.txt
new file mode 100644
index 00000000000..cb5d194cd4a
--- /dev/null
+++ b/.changelog/23879.txt
@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_lambda_function: Add error handling for `ResourceConflictException` errors on create and update
+```
\ No newline at end of file