diff --git a/tensorflow/core/kernels/BUILD b/tensorflow/core/kernels/BUILD
index c64380890bb..2632728e9f8 100644
--- a/tensorflow/core/kernels/BUILD
+++ b/tensorflow/core/kernels/BUILD
@@ -6654,6 +6654,7 @@ filegroup(
         "cwise_op_bitwise_and.cc",
         "cwise_op_bitwise_or.cc",
         "cwise_op_bitwise_xor.cc",
+        "cwise_op_conj.cc",
         "cwise_op_cos.cc",
         "cwise_op_cosh.cc",
         "cwise_op_div.cc",
diff --git a/tensorflow/lite/delegates/flex/whitelisted_flex_ops.cc b/tensorflow/lite/delegates/flex/whitelisted_flex_ops.cc
index 639adf72fcf..b38a66f5687 100644
--- a/tensorflow/lite/delegates/flex/whitelisted_flex_ops.cc
+++ b/tensorflow/lite/delegates/flex/whitelisted_flex_ops.cc
@@ -76,6 +76,7 @@ bool IsWhitelistedFlexOp(const std::string& tensorflow_op_name) {
           "Concat",
           "ConcatOffset",
           "ConcatV2",
+          "Conj",
           "ConjugateTranspose",
           "Const",
           "ControlTrigger",