fix color issue, add escape issue for tmux and vim
fix conflicts