fix merge doc

Signed-off-by: Kevin Labesse <kevin@labesse.me>

docs/helm/helm_install.md

@@ -78,11 +78,8 @@ helm install [CHART] [flags]
 ### Options
 
 ```
-<<<<<<< HEAD
       --app-version string       specify an app version for the release
-=======
       --atomic                   if set, installation process purges chart on fail, also sets --wait flag
->>>>>>> master
       --ca-file string           verify certificates of HTTPS-enabled servers using this CA bundle
       --cert-file string         identify HTTPS client using this SSL certificate file
       --dep-up                   run helm dependency update before installing the chart

docs/helm/helm_upgrade.md

@@ -65,11 +65,8 @@ helm upgrade [RELEASE] [CHART] [flags]
 ### Options
 
 ```
-<<<<<<< HEAD
       --app-version string       specify the app version to use for the upgrade
-=======
       --atomic                   if set, upgrade process rolls back changes made in case of failed upgrade, also sets --wait flag
->>>>>>> master
       --ca-file string           verify certificates of HTTPS-enabled servers using this CA bundle
       --cert-file string         identify HTTPS client using this SSL certificate file
       --description string       specify the description to use for the upgrade, rather than the default