resolve merge conflict

Merge branch 'main' into rc/3.5.2

# Conflicts:
#	DESCRIPTION
#	NAMESPACE
#	R/aes.R
#	R/bin.R
#	R/coord-.R
#	R/coord-cartesian-.R
#	R/facet-.R
#	R/fortify.R
#	R/geom-.R
#	R/geom-defaults.R
#	R/geom-label.R
#	R/ggproto.R
#	R/guide-.R
#	R/guide-axis.R
#	R/guides-.R
#	R/layer.R
#	R/margins.R
#	R/plot-build.R
#	R/plot-construction.R
#	R/plot.R
#	R/position-.R
#	R/save.R
#	R/scale-.R
#	R/scale-colour.R
#	R/stat-.R
#	R/stat-ellipse.R
#	R/theme-current.R
#	R/theme-elements.R
#	R/theme.R
#	README.Rmd
#	cran-comments.md
#	man/coord_polar.Rd
#	man/element.Rd
#	man/get_geom_defaults.Rd
#	man/is_tests.Rd
#	man/stat_connect.Rd
#	man/stat_ellipse.Rd
#	revdep/README.md
#	revdep/cran.md
#	revdep/failures.md
#	revdep/problems.md
#	tests/testthat/_snaps/utilities-checks.md
#	tests/testthat/test-utilities-checks.R

Author: teunbrand

R/theme-elements.R

@@ -173,20 +173,6 @@ element_text <- function(family = NULL, face = NULL, colour = NULL,
   )
 }
 
-#' @export
-#' @rdname element
-is_theme_element <- function(x, type = "any") {
-  switch(
-    type %||% "any",
-    any   = inherits(x, "element"),
-    rect  = inherits(x, "element_rect"),
-    line  = inherits(x, "element_line"),
-    text  = inherits(x, "element_text"),
-    blank = inherits(x, "element_blank"),
-    FALSE
-  )
-}
-
 element_polygon <- function(fill = NULL, colour = NULL, linewidth = NULL,
                             linetype = NULL, color = NULL,
                             inherit.blank = FALSE) {
@@ -260,6 +246,20 @@ element_geom <- function(
   fill = NULL, colour = NULL
 )
 
+#' @export
+#' @rdname element
+is_theme_element <- function(x, type = "any") {
+  switch(
+    type %||% "any",
+    any   = inherits(x, "element"),
+    rect  = inherits(x, "element_rect"),
+    line  = inherits(x, "element_line"),
+    text  = inherits(x, "element_text"),
+    blank = inherits(x, "element_blank"),
+    FALSE
+  )
+}
+
 #' @export
 print.element <- function(x, ...) utils::str(x)