diff --git a/resources/columms-glance.edn b/resources/columms-glance.edn
index a8e9321..8e1d057 100644
--- a/resources/columms-glance.edn
+++ b/resources/columms-glance.edn
@@ -68,11 +68,7 @@
 ;; :missing-method "Method for eliminating missing data.",
 ;; :model "A character string denoting the model at which the optimal BIC occurs.",
  :mse "Mean Squared Deviation"
-<<<<<<< HEAD
-;; :n "The total number of observations.",
-=======
-:n "The total number of observations.",
->>>>>>> 778eff62acb97776cd1e3f783ce8dee9566230b9
+ :n "The total number of observations.",
 ;; :n.clusters "Number of clusters.",
 ;; :n.factors "The number of fitted factors.",
 ;; :n.max "Maximum number of subjects at risk.",
@@ -120,11 +116,7 @@
 ;; :sigma-2-j "The square root of the estimated residual variance for the j-th longitudinal process.",
 ;; :spar "Smoothing parameter.",
 ;; :srmr "Standardised root mean residual.",
-<<<<<<< HEAD
-;; :statistic "Test statistic.",
-=======
 :statistic "Test statistic.",
->>>>>>> 778eff62acb97776cd1e3f783ce8dee9566230b9
 ;; :statistic.-sargan "Statistic for Sargan test.",
 ;; :statistic.weak.instr "Statistic for weak instrument F-test.",
 ;; :statistic.-wu.-hausman "Statistic for Wu-Hausman test.",