fix(changelog): remove conflicting git statements

Author: harshithkashyap

CHANGELOG.md

@@ -15,8 +15,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
-<<<<<<< HEAD
-=======
 ### Breaking Changes
 
 - Build folders updated
@@ -64,7 +62,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
    - [`webpack-cli@3.3.8`](https://npmjs.com/package/webpack-cli)
 
 
->>>>>>> fix(directline): add new changes from master
 ### Changed
 - Update DirectLine to rxjs v6 pipeable operators, PR [#102](https://github.com/Microsoft/BotFramework-DirectLineJS/pull/102/files)