Finished merge

Author: jeremymccurdy-redspace

CHANGELOG.md

@@ -5,14 +5,6 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-<<<<<<< HEAD
-## [1.4.0] - TBD
-
-### Changed
-
-- Updated Phaser to 3.80.1
-- Fixed warning with SpringRoll listeners
-=======
 ## [2.0.0] - 2024-05-09
 
 ### Changed
@@ -27,21 +19,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Phaser: Updated SpringRoll to 2.6.0
 - Phaser: Updated feature list and state listeners to follow a standardized set
 
->>>>>>> release/2.0.0
 
 ## [1.3.1] - 2023-03-28
 
 ### Fixed
 
-<<<<<<< HEAD
-- Removed incorrect references to non-NPM registry in package lock
-=======
 - Removed incorrect references to non-NPM registry in package-lock
 
 ### Changed
 
 - Updated package-lock file to most recent versions
->>>>>>> release/2.0.0
 
 ## [1.3.0] - 2023-03-13