CHANGELOG.md in uglifier-3.1.3.harmony1 vs CHANGELOG.md in uglifier-3.1.3

@@ -1,9 +1,5 @@
-## 3.1.3.harmony1 (4 March 2017)
-
-- use WIP Harmony-version of UglifyJs 2.8.5
-
 ## 3.1.3 (2 March 2017)
 
 - update UglifyJS to 2.8.5
 - default passes to 1
 - allow source_map option to be `true` instead of a hash
@@ -24,10 +20,9 @@
 - add reduce_vars compress option
 - enable `reduce_vars` and `collapse_vars` compress options by default
 - unused top-level function and variable removal with `toplevel` compress option
 - add `top_retain` compress option to specify list of top-level variables to always retain
 - add `unsafe_comps` and `unsafe_proto` options
->>>>>>> origin/master
 
 ## 3.0.4 (30 November 2016)
 
 - update UglifyJS to 2.7.5
 - implement ignore_quoted and debug options for mangle_properties