diff --git a/ddtrace/profiling/collector/__init__.py b/ddtrace/profiling/collector/__init__.py
index 9453d6f5c43..ca2f2809472 100644
--- a/ddtrace/profiling/collector/__init__.py
+++ b/ddtrace/profiling/collector/__init__.py
@@ -77,5 +77,9 @@ def _create_capture_sampler(collector):
 
 @attr.s
 class CaptureSamplerCollector(Collector):
+<<<<<<< HEAD
     capture_pct = attr.ib(factory=attr_utils.from_env("DD_PROFILING_CAPTURE_PCT", 2.0, float))
+=======
+    capture_pct = attr.ib(factory=attr_utils.from_env("DD_PROFILING_CAPTURE_PCT", 1.0, float))
+>>>>>>> 0ba3e299 (Remove ignores for updated mypy (#4253))
     _capture_sampler = attr.ib(default=attr.Factory(_create_capture_sampler, takes_self=True), init=False, repr=False)
diff --git a/ddtrace/profiling/collector/memalloc.py b/ddtrace/profiling/collector/memalloc.py
index 3bb6c16b03a..ac4738195f1 100644
--- a/ddtrace/profiling/collector/memalloc.py
+++ b/ddtrace/profiling/collector/memalloc.py
@@ -88,7 +88,17 @@ class MemoryCollector(collector.PeriodicCollector):
     _interval = attr.ib(default=_DEFAULT_INTERVAL, repr=False)
 
     # TODO make this dynamic based on the 1. interval and 2. the max number of events allowed in the Recorder
+<<<<<<< HEAD
     _max_events = attr.ib(factory=attr_utils.from_env("_DD_PROFILING_MEMORY_EVENTS_BUFFER", _DEFAULT_MAX_EVENTS, int))
+=======
+    _max_events = attr.ib(
+        factory=attr_utils.from_env(
+            "_DD_PROFILING_MEMORY_EVENTS_BUFFER",
+            _DEFAULT_MAX_EVENTS,
+            int,
+        )
+    )
+>>>>>>> 0ba3e299 (Remove ignores for updated mypy (#4253))
     max_nframe = attr.ib(factory=attr_utils.from_env("DD_PROFILING_MAX_FRAMES", 64, int))
     heap_sample_size = attr.ib(type=int, factory=_get_default_heap_sample_size)
     ignore_profiler = attr.ib(factory=attr_utils.from_env("DD_PROFILING_IGNORE_PROFILER", False, formats.asbool))
diff --git a/ddtrace/profiling/exporter/http.py b/ddtrace/profiling/exporter/http.py
index 17357f706b1..fed84d2717d 100644
--- a/ddtrace/profiling/exporter/http.py
+++ b/ddtrace/profiling/exporter/http.py
@@ -43,7 +43,14 @@ class PprofHTTPExporter(pprof.PprofExporter):
     api_key = attr.ib(default=None, type=typing.Optional[str])
     # Do not use the default agent timeout: it is too short, the agent is just a unbuffered proxy and the profiling
     # backend is not as fast as the tracer one.
+<<<<<<< HEAD
     timeout = attr.ib(factory=attr_utils.from_env("DD_PROFILING_API_TIMEOUT", 10.0, float), type=float)
+=======
+    timeout = attr.ib(
+        factory=attr_utils.from_env("DD_PROFILING_API_TIMEOUT", 10.0, float),
+        type=float,
+    )
+>>>>>>> 0ba3e299 (Remove ignores for updated mypy (#4253))
     service = attr.ib(default=None, type=typing.Optional[str])
     env = attr.ib(default=None, type=typing.Optional[str])
     version = attr.ib(default=None, type=typing.Optional[str])