diff --git a/shell.env b/shell.env
index 7a23a41..bfa287f 100755
--- a/shell.env
+++ b/shell.env
@@ -90,7 +90,11 @@ BASH_SHELL_ANY_NETWORK=$parent/any/network
 export BASH_SHELL_DIRS
 
 # machine specific shell
+<<<<<<< HEAD
 BASH_SHELL_HOST="$parent/$([[ -f /etc/host ]] && cat /etc/host || echo nohostname)
+=======
+BASH_SHELL_HOST="$parent/$([[ -f /etc/host ]] && cat /etc/host || echo nohostname)"
+>>>>>>> d70e9dc (fix handle no /etc/host file like inside docker container)
 # BASH_SHELL_HOST=<some directory>
 # if there is a host directory add it to list and export env var
 # [[ -d $BASH_SHELL_HOST ]] && BASH_SHELL_DIRS+="$BASH_SHELL_HOST " && export BASH_SHELL_HOST