diff --git a/docs/getting_started/metrics_example.py b/docs/getting_started/metrics_example.py
index 83c9a1b8c4..66ea57438f 100644
--- a/docs/getting_started/metrics_example.py
+++ b/docs/getting_started/metrics_example.py
@@ -75,4 +75,8 @@ def observable_gauge_func(options: CallbackOptions) -> Iterable[Observation]:
 histogram.record(99.9)
 
 # Async Gauge
-gauge = meter.create_observable_gauge("gauge", [observable_gauge_func])
+observable_gauge = meter.create_observable_gauge("gauge", [observable_gauge_func])
+
+# Sync Gauge
+gauge = meter.create_gauge("gauge")
+gauge.set(1)
diff --git a/exporter/opentelemetry-exporter-otlp-proto-grpc/src/opentelemetry/exporter/otlp/proto/grpc/metric_exporter/__init__.py b/exporter/opentelemetry-exporter-otlp-proto-grpc/src/opentelemetry/exporter/otlp/proto/grpc/metric_exporter/__init__.py
index d74c50bf50..2560c5c305 100644
--- a/exporter/opentelemetry-exporter-otlp-proto-grpc/src/opentelemetry/exporter/otlp/proto/grpc/metric_exporter/__init__.py
+++ b/exporter/opentelemetry-exporter-otlp-proto-grpc/src/opentelemetry/exporter/otlp/proto/grpc/metric_exporter/__init__.py
@@ -47,28 +47,10 @@
     OTEL_EXPORTER_OTLP_METRICS_HEADERS,
     OTEL_EXPORTER_OTLP_METRICS_INSECURE,
     OTEL_EXPORTER_OTLP_METRICS_TIMEOUT,
-<<<<<<< HEAD
-=======
-    OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE,
-)
-from opentelemetry.sdk.metrics import (
-    Counter,
-    Histogram,
-    Gauge,
-    ObservableCounter,
-    ObservableGauge,
-    ObservableUpDownCounter,
-    UpDownCounter,
->>>>>>> ad714a7ab (Add synchronous gauge)
 )
 from opentelemetry.sdk.metrics.export import (
     AggregationTemporality,
     DataPointT,
-<<<<<<< HEAD
-=======
-    Gauge as GaugeType,
-    Histogram as HistogramType,
->>>>>>> ad714a7ab (Add synchronous gauge)
     Metric,
     MetricExporter,
     MetricExportResult,
diff --git a/opentelemetry-sdk/src/opentelemetry/sdk/metrics/_internal/aggregation.py b/opentelemetry-sdk/src/opentelemetry/sdk/metrics/_internal/aggregation.py
index e7f82ce95c..f6d9e704d2 100644
--- a/opentelemetry-sdk/src/opentelemetry/sdk/metrics/_internal/aggregation.py
+++ b/opentelemetry-sdk/src/opentelemetry/sdk/metrics/_internal/aggregation.py
@@ -44,15 +44,11 @@
     LogarithmMapping,
 )
 from opentelemetry.sdk.metrics._internal.measurement import Measurement
-<<<<<<< HEAD
 from opentelemetry.sdk.metrics._internal.point import Buckets as BucketsPoint
 from opentelemetry.sdk.metrics._internal.point import (
     ExponentialHistogramDataPoint,
-    Gauge,
+    Gauge as GaugePoint,
 )
-=======
-from opentelemetry.sdk.metrics._internal.point import Gauge as GaugePoint
->>>>>>> ad714a7ab (Add synchronous gauge)
 from opentelemetry.sdk.metrics._internal.point import (
     Histogram as HistogramPoint,
 )