diff --git a/src/model/formulations/ArrCon2000/ramp.jl b/src/model/formulations/ArrCon2000/ramp.jl
index 9f1979c..b725892 100644
--- a/src/model/formulations/ArrCon2000/ramp.jl
+++ b/src/model/formulations/ArrCon2000/ramp.jl
@@ -45,7 +45,7 @@ function _add_ramp_eqs!(
     for t in 1:model[:instance].time
         # Ramp up limit
         if t == 1
-            if _is_initially_on(g)
+            if is_initially_on
                 # min power is _not_ multiplied by is_on because if !is_on, then ramp up is irrelevant
                 eq_ramp_up[gn, t] = @constraint(
                     model,
@@ -76,7 +76,7 @@ function _add_ramp_eqs!(
 
         # Ramp down limit
         if t == 1
-            if _is_initially_on(g)
+            if is_initially_on
                 # TODO If RD < SD, or more specifically if
                 #      min_power + RD < initial_power < SD
                 #      then the generator should be able to shut down at time t = 1,
diff --git a/src/model/formulations/base/unit.jl b/src/model/formulations/base/unit.jl
index 5eba3d9..9015c9d 100644
--- a/src/model/formulations/base/unit.jl
+++ b/src/model/formulations/base/unit.jl
@@ -247,10 +247,6 @@ Variables
 * `is_on`
 * `switch_off`
 * `switch_on`
-<<<<<<< HEAD
-=======
-
->>>>>>> c8bf25f (Documented reserve shortfall, soved comments on variables/constraints to structs.jl files, simplified loops, removed extra comments, started replacement of constant-subsitution with @constraint (with option to use fix).)
 
 Constraints
 ---