CHANGELOG.markdown in scout-5.9.8.pre vs CHANGELOG.markdown in scout-5.9.8

@@ -1,16 +1,15 @@
 # 5.9.8
 
-* Added Nagios plugin support via the `--nagios` flag.
+* Make validation of private plugins more robust
 
 # 5.9.7.1
 
 * write a bit more information about system metrics in the realtime log
 
 # 5.9.7
 
 * Preliminary support for realtime compatibility with GO agent
->>>>>>> master
 
 # 5.9.5
 
 * If plugin last_run is in the future, run the plugins now