diff --git a/alacritty/.config/alacritty/alacritty.toml b/alacritty/.config/alacritty/alacritty.toml
index b50c886..b0dca72 100644
--- a/alacritty/.config/alacritty/alacritty.toml
+++ b/alacritty/.config/alacritty/alacritty.toml
@@ -1,3 +1,7 @@
+<<<<<<< HEAD
+=======
+# import = ["~/.config/alacritty/themes/summer.toml"]
+>>>>>>> ad9023961deaa970bef4341893ea13935999c6fe
 
 [window]
 padding = { x = 2, y = 0 }
diff --git a/bashrc/.bashrc b/bashrc/.bashrc
index 01ddbae..ec9375d 100644
--- a/bashrc/.bashrc
+++ b/bashrc/.bashrc
@@ -2,6 +2,9 @@
 # ~/.bashrc
 #
 
+# disable duplicates in command history
+export HISTCONTROL=ignoreboth:erasedups
+
 # If not running interactively, don't do anything
 [[ $- != *i* ]] && return
 
diff --git a/code/.config/Code/User/settings.json b/code/.config/Code/User/settings.json
index 671916f..efe2ada 100755
--- a/code/.config/Code/User/settings.json
+++ b/code/.config/Code/User/settings.json
@@ -1,7 +1,6 @@
 // path="~/.config/Code/User
 {
     "editor.fontFamily": "'VictorMono Nerd Font'",
-    "editor.fontWeight": 500,
     "extensions.ignoreRecommendations": true,
     "workbench.startupEditor": "none",
     "git.openRepositoryInParentFolders": "never",
@@ -19,7 +18,7 @@
     "editor.minimap.renderCharacters": false,
     "update.showReleaseNotes": false,
     "editor.accessibilityPageSize": 100,
-    "editor.fontSize": 15,
+    "editor.fontSize": 18,
     "editor.stickyScroll.enabled": false,
     "files.associations": {
         "*.txt": "shellscript"
diff --git a/starship/.config/starship.toml b/starship/.config/starship.toml
index 1335d66..1dc2dfe 100755
--- a/starship/.config/starship.toml
+++ b/starship/.config/starship.toml
@@ -32,7 +32,7 @@ zx_cyan = "#15D7E5"
 zx_light_cyan = "#65E7F1"
 zx_dark_cyan = "#109EA8"
 zx_white = "#DFDFD0"
-zx_gray = "#808078"
+zx_grey = "#808078"
 zx_pastel_yellow = "#F1EAA2"
 
 # You can also replace your username with a neat symbol like   or disable this
@@ -97,7 +97,7 @@ disabled = false
 style = "fg:zx_white"
 format = ' $symbol'
 symbol = '[\[](bold fg:zx_pastel_yellow)[err](bold)[\]](bold fg:zx_pastel_yellow)'
-success_symbol = '[\[](bold fg:zx_dark_cyan)[ok](bold)[\]](bold fg:zx_dark_cyan)'
+success_symbol = '[\[](bold fg:zx_grey)[ok](bold)[\]](bold fg:zx_grey)'
 
 [fill]
 disabled = false