Update CHANGELOG.md

remove duplicate entry

Author: isc-tleavitt

CHANGELOG.md

@@ -21,7 +21,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - 'New Branch' menu option in basic now will create new branches from the configured default merge branch (#366)
 - Merging back with the default merge branch is now a part of the basic mode's Sync flow (#366)
 - Added a new option "compileOnImport". If true, Import options will compile files using the pull event handler. (#362)
-- If merge conflicts occur on the production during Sync due to multiple branches all adding business hosts, they will be resolved automatically.
 
 ### Fixed
 - Modifications to local repo files are now synced with IRIS (#153)