diff --git a/NEWS.md b/NEWS.md
index 9781e7f3..ceafd6cb 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,12 +1,10 @@
 # mvgam 1.1.4 (development version; not yet on CRAN)
 ## New functionalities
 * Added a `stability.mvgam` method to compute stability metrics from models fit with Vector Autoregressive dynamics (#21)
-<<<<<<< HEAD
 * Added functionality to estimate hierarchical error correlations when using multivariate latent process models and when the data are nested among levels of a relevant grouping factor (#75); see `?mvgam::AR` for an example
 * Added `ZMVN()` error models for estimating Zero-Mean Multivariate Normal errors; convenient for working with non time-series data where latent residuals are expected to be correlated (such as when fitting Joint Species Distribution Models); see `?mvgam::ZMVN` for examples
 =======
 * Added a `fevd.mvgam` method to compute forecast error variance decompositions from models fit with Vector Autoregressive dynamics
->>>>>>> 69f362a154824599b27602062025a01b5e3515b9
 
 ## Bug fixes
 * Fixed a minor bug in the way `trend_map` recognises levels of the `series` factor