diff --git a/timestamped/2026-02-17_16-36-35.md b/timestamped/2026-02-17_16-36-35.md
index fea61ac..311b2d5 100644
--- a/timestamped/2026-02-17_16-36-35.md
+++ b/timestamped/2026-02-17_16-36-35.md
@@ -21,8 +21,16 @@ variance of actual cost/hours versus estimated,
 (obviously) requires estimates,
 which are subject to bias and error.
 If you argue that subject matter expert estimates _are_ objective
+<<<<<<< HEAD
 under a Bayesian interpretation,
 then sure, but then EVM is not unique.
 
 EVM WBS's, as a form of [[estimate-decomposition]],
 suffer from its weakness of compounding inaccuracy.
+=======
+under the Bayesian interpretation,
+then sure, but then EVM is not unique.
+
+EVM as a form of [[estimate-decomposition]]
+suffers f
+>>>>>>> origin/main