diff --git a/collector/pg_stat_activity_autovacuum_active.go b/collector/pg_stat_activity_autovacuum_active.go
index c516f955..48fe5a7b 100644
--- a/collector/pg_stat_activity_autovacuum_active.go
+++ b/collector/pg_stat_activity_autovacuum_active.go
@@ -46,14 +46,23 @@ var (
 	SELECT
 		v.phase,
 		CASE
+<<<<<<< HEAD
 			when a.query ~ '^autovacuum.*to prevent wraparound' then 'wraparound'
 			when a.query ~* '^vacuum' then 'user'
 			when a.pid is null then 'idle'
 		ELSE 'regular'
 		END AS mode,
 		count(1) AS workers_count
+=======
+			WHEN a.query ~ '^autovacuum.*to prevent wraparound' THEN 'wraparound'
+			WHEN a.query ~* '^vacuum' THEN 'user'
+			WHEN a.pid is NULL THEN 'idle'
+			ELSE 'regular'
+		END as mode,
+		count(1) as workers_count
+>>>>>>> c928d57 (SQL formatting)
 	FROM pg_stat_progress_vacuum v
-	LEFT JOIN pg_catalog.pg_stat_activity a using (pid)
+	LEFT JOIN pg_catalog.pg_stat_activity a USING (pid)
 	GROUP BY 1,2
 	`
 )