diff --git a/changelog.txt b/changelog.txt
index a75883adc..62ee1b6e3 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -14,7 +14,11 @@ Version 0.26
 Fixed
 +++++
 
+<<<<<<< HEAD
 - Packaging of files in ``flow.scripts`` used in CLI (#765).
+=======
+- Schedule 56 cores per node on OLCF Frontier (#764).
+>>>>>>> main
 
 [0.26.0] -- 2023-09-06
 ----------------------
diff --git a/flow/environments/incite.py b/flow/environments/incite.py
index ac1c5fe0b..8225b18b7 100644
--- a/flow/environments/incite.py
+++ b/flow/environments/incite.py
@@ -267,7 +267,7 @@ class FrontierEnvironment(DefaultSlurmEnvironment):
 
     hostname_pattern = r".*\.frontier\.olcf\.ornl\.gov"
     template = "frontier.sh"
-    cores_per_node = 64
+    cores_per_node = 56
     gpus_per_node = 8
     mpi_cmd = "srun"