fix merge conflicts

diff --cc dotbash_profile
index a55617616e37a51ce78ee6f95fb6e329e31bb755,7fa1a0b949e9c915d4bac4acd823ef8045e3716f..2ee27ccd484cb3f8464e959de08f421999473230
--- 1/dotbash_profile
--- 2/dotbash_profile
+++ b/dotbash_profile
@@@ -118,7 -118,7 +118,11 @@@ export PATH=$PATH:$(go env GOPATH)/bi
  #
  ##################################################
  
++<<<<<<< HEAD
 +export PATH=/opt/node/bin/:$PATH
++=======
+ export PATH=/opt/node/bin:$PATH
++>>>>>>> 9f6202f8a285245e27f1372605e2c435839312d3
  
  ##################################################
  #
@@@ -160,8 -160,10 +164,11 @@@ complete -F _ssh_hosts ss
  #
  ##################################################
  
+ alias ls="ls --color=auto"
  alias grep="grep --color=auto"
  export EDITOR=/usr/bin/vi
 -export PATH=~/bin:~/.local/bin:/opt/bin:$PATH
 +export PATH=~/.local/bin:~/bin:/opt/bin:$PATH
 +export PATH=~/bin/android_sdk/cmdline-tools/latest/bin:$PATH
  . "$HOME/.cargo/env"
+ 
+ eval "$(direnv hook bash)"

diff --cc i3/i3.conf
index 98a834f0fb5aa682e1ec8a28ebcbe3cebde36056,e63d96235690cab437c25aea23a487d582191c26..8199e7ed1d9cc50987ebb3b199ab9abf47165146
--- 1/i3/i3.conf
--- 2/i3/i3.conf
+++ b/i3/i3.conf
@@@ -188,7 -188,7 +188,8 @@@ bindsym $mod+t exec komputeko.s
  for_window [class="Tor Browser"] floating enable, border normal
  for_window [class="XCalc"] floating enable, border normal
  for_window [class="KeePassXC"] floating enable, border normal
 +#for_window [class="FreeCAD"] 
+ for_window [class="Rhythmbox"] floating enable, border normal
  
  bindsym --release $mod+Pause exec --no-startup-id slock