fix merge conflict, update README

README.md

@@ -12,7 +12,7 @@ The grafana package
 * run rpm linter: `rpkg lint -r grafana.rpmlintrc`
 * run local builds with different OS versions: `./run_container_build.sh fedora-version`
 * run a scratch build: `fedpkg scratch-build --srpm`
-* upload new source tarballs: `fedpkg new-sources grafana-X.Y.Z.tar.gz grafana-vendor-X.Y.Z.tar.gz`
+* upload new source tarballs: `fedpkg new-sources *.tar.gz`
 
 ## Backporting
 * create the patch

grafana.spec

@@ -13,13 +13,8 @@ end}
 %define compile_frontend 0
 
 Name:             grafana
-<<<<<<< HEAD
-Version:          7.1.1
-Release:          2%{?dist}
-=======
 Version:          7.3.1
 Release:          1%{?dist}
->>>>>>> 84a264d... update to upstream version 7.3.1, resolve RHBZ #1843170
 Summary:          Metrics dashboard and graph editor
 License:          ASL 2.0
 URL:              https://grafana.org