diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000000000..4ee70dd42
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,6 @@
+[*.cs]
+
+# IDE0090: Use 'new(...)'
+csharp_style_implicit_object_creation_when_type_is_apparent = false
+
+dotnet_diagnostic.CA1806.severity = silent
diff --git a/.gitattributes b/.gitattributes
index 56f8e94c2..219869ee0 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,4 +1,5 @@
 # Declare files that will always have CRLF line endings on checkout.
 *.sln text eol=crlf
 *.cs text eol=crlf
-*.xml text eol=crlf
\ No newline at end of file
+*.xml text eol=crlf
+Barotrauma\BarotraumaServer\DedicatedServer.exe text eol=lf
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index bb7b4999c..f7f77dc2c 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -52,8 +52,9 @@ body:
       label: Version
       description: Which version of the game did the bug happen in? You can see the current version number in the bottom left corner of your screen in the main menu.
       options:      
-        - 0.18.15.1 / 0.18.15.2 on macOS
-        - 0.19.8.0 (unstable)
+        - 0.21.6.0
+        - 0.21.6.0 (Unstable)
+        - Faction/endgame test branch
         - Other
     validations:
       required: true