diff --git a/.editorconfig b/.editorconfig
index cef1c46..82a59af 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -9,6 +9,10 @@ indent_style = tab
 insert_final_newline = true
 tab_width = 4
 trim_trailing_whitespace = true
+<<<<<<< Updated upstream
 
 [*.{yml,yaml}]
 indent_style = space
+=======
+ij_kotlin_name_count_to_use_star_import = 2147483647
+>>>>>>> Stashed changes