resolved merge conflict on versions.toml
resolved merge conflict on versions.toml

influxdata/docs.influxdata.com,influxdata/docs.influxdata.com,influxdb/docs.influxdata.com,influxdb/docs.influxdata.com,influxdb/docs.influxdata.com,influxdata/docs.influxdata.com,influxdata/docs.influxdata.com,influxdata/docs.influxdata.com