diff --git a/CONFIGURATION.md b/CONFIGURATION.md
index ee79da98a..60a18e18b 100644
--- a/CONFIGURATION.md
+++ b/CONFIGURATION.md
@@ -70,6 +70,10 @@ fields which begin with `time_`.
   precision = "s"
 
 # INPUTS
+<<<<<<< HEAD
+=======
+[inputs]
+>>>>>>> ac13af0... 0.3.0: update README and documentation
 [[inputs.cpu]]
   percpu = true
   totalcpu = false
@@ -80,6 +84,10 @@ fields which begin with `time_`.
 ### Input Config: tagpass and tagdrop
 
 ```toml
+<<<<<<< HEAD
+=======
+[inputs]
+>>>>>>> ac13af0... 0.3.0: update README and documentation
 [[inputs.cpu]]
   percpu = true
   totalcpu = false