diff --git a/src/TickerQ.EntityFrameworkCore/Infrastructure/MappingExtensions.cs b/src/TickerQ.EntityFrameworkCore/Infrastructure/MappingExtensions.cs
index 86fc07db..129f68d6 100644
--- a/src/TickerQ.EntityFrameworkCore/Infrastructure/MappingExtensions.cs
+++ b/src/TickerQ.EntityFrameworkCore/Infrastructure/MappingExtensions.cs
@@ -117,11 +117,25 @@ internal static Expression<Func<SetPropertyCalls<CronTickerOccurrenceEntity<TCro
                     s => s.SetProperty(x => x.RetryCount, functionContext.RetryCount));
 
             if (propsToUpdate.Contains(nameof(InternalFunctionContext.ReleaseLock)))
+<<<<<<< HEAD
                 setExpression = ExpressionHelper.CombineSetters(setExpression,
                     s => s.SetProperty(x => x.LockHolder, (string)null)
                         .SetProperty(x => x.LockedAt, (DateTime?)null));
             
             return setExpression;
+=======
+            {
+                setters
+                    .SetProperty(x => x.LockHolder, (string)null)
+                    .SetProperty(x => x.LockedAt, (DateTime?)null);
+            }
+
+            // EXECUTION TIME
+            if (propsToUpdate.Contains(nameof(InternalFunctionContext.ExecutionTime)))
+            {
+                setters.SetProperty(x => x.ExecutionTime, functionContext.ExecutionTime);
+            }
+>>>>>>> 298ca68 (fix update ExecutionTime for CronTickerOccurrence (#461))
         }
         
         internal static Expression<Func<SetPropertyCalls<TTimeTicker>, SetPropertyCalls<TTimeTicker>>> UpdateTimeTicker<TTimeTicker>(InternalFunctionContext functionContext, DateTime updatedAt)